[MSO-8] Second step of the rebase for MSO

Second rebase containing additional features for MSO + total reworking
of the BPMN structure + Notification flow can now be added at the end of
some BPMN flows

Change-Id: I7e937c7a0ba1593ca85e164a093f79c7e38b6ce0
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/CRTGVNF_queryAAIResponseVolume.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/CRTGVNF_queryAAIResponseVolume.xml
index 52d2b01..182d7c9 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/CRTGVNF_queryAAIResponseVolume.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/CRTGVNF_queryAAIResponseVolume.xml
@@ -1,22 +1,22 @@
-  <volume-group xmlns="http://com.att.aai.inventory/v6">
-         <volume-group-id>a8399879-31b3-4973-be26-0a0cbe776b58</volume-group-id>
-         <volume-group-name>MoG_CinderVolumes_2</volume-group-name>
-         <heat-stack-id>MoG_CinderVolumes_2/19387dc6-060f-446e-b41f-dcfd29c73845</heat-stack-id>
-         <vnf-type>VmogSvc/moge2e2</vnf-type>
-         <orchestration-status>Active</orchestration-status>
-         <resource-version>1458839419</resource-version>
-         <relationship-list>
-            <relationship>
-               <related-to>tenant</related-to>
-               <related-link>https://aai-app-e2e.test.att.com:8443/aai/v6/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>
-               <relationship-data>
-                  <relationship-key>tenant.tenant-id</relationship-key>
-                  <relationship-value>7dd5365547234ee8937416c65507d266</relationship-value>
-               </relationship-data>
-               <related-to-property>
-                  <property-key>tenant.tenant-name</property-key>
-                  <property-value>MOG-25208-D-01</property-value>
-               </related-to-property>
-            </relationship>
-         </relationship-list>
+  <volume-group xmlns="http://com.aai.inventory/v6">

+         <volume-group-id>a8399879-31b3-4973-be26-0a0cbe776b58</volume-group-id>

+         <volume-group-name>MoG_CinderVolumes_2</volume-group-name>

+         <heat-stack-id>MoG_CinderVolumes_2/19387dc6-060f-446e-b41f-dcfd29c73845</heat-stack-id>

+         <vnf-type>VmogSvc/moge2e2</vnf-type>

+         <orchestration-status>Active</orchestration-status>

+         <resource-version>1458839419</resource-version>

+         <relationship-list>

+            <relationship>

+               <related-to>tenant</related-to>

+               <related-link>https://aai-app-e2e.test.com:8443/aai/v6/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>

+               <relationship-data>

+                  <relationship-key>tenant.tenant-id</relationship-key>

+                  <relationship-value>7dd5365547234ee8937416c65507d266</relationship-value>

+               </relationship-data>

+               <related-to-property>

+                  <property-key>tenant.tenant-name</property-key>

+                  <property-value>MOG-25208-D-01</property-value>

+               </related-to-property>

+            </relationship>

+         </relationship-list>

       </volume-group>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/CRTGVNF_queryAAIResponseVolume_idsNotMatch.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/CRTGVNF_queryAAIResponseVolume_idsNotMatch.xml
index 79e7d84..9b91bc5 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/CRTGVNF_queryAAIResponseVolume_idsNotMatch.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/CRTGVNF_queryAAIResponseVolume_idsNotMatch.xml
@@ -1,22 +1,22 @@
-  <volume-group xmlns="http://com.att.aai.inventory/v6">
-         <volume-group-id>a8399879-31b3-4973-be26-0a0cbe776b58</volume-group-id>
-         <volume-group-name>MoG_CinderVolumes_2</volume-group-name>
-         <heat-stack-id>MoG_CinderVolumes_2/19387dc6-060f-446e-b41f-dcfd29c73845</heat-stack-id>
-         <vnf-type>VmogSvc/moge2e2</vnf-type>
-         <orchestration-status>Active</orchestration-status>
-         <resource-version>1458839419</resource-version>
-         <relationship-list>
-            <relationship>
-               <related-to>tenant</related-to>
-               <related-link>https://aai-app-e2e.test.att.com:8443/aai/v6/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>
-               <relationship-data>
-                  <relationship-key>tenant.tenant-id</relationship-key>
-                  <relationship-value>83464847234ee8937416c65507d267</relationship-value>
-               </relationship-data>
-               <related-to-property>
-                  <property-key>tenant.tenant-name</property-key>
-                  <property-value>MOG-25208-D-01</property-value>
-               </related-to-property>
-            </relationship>
-         </relationship-list>
+  <volume-group xmlns="http://com.aai.inventory/v6">

+         <volume-group-id>a8399879-31b3-4973-be26-0a0cbe776b58</volume-group-id>

+         <volume-group-name>MoG_CinderVolumes_2</volume-group-name>

+         <heat-stack-id>MoG_CinderVolumes_2/19387dc6-060f-446e-b41f-dcfd29c73845</heat-stack-id>

+         <vnf-type>VmogSvc/moge2e2</vnf-type>

+         <orchestration-status>Active</orchestration-status>

+         <resource-version>1458839419</resource-version>

+         <relationship-list>

+            <relationship>

+               <related-to>tenant</related-to>

+               <related-link>https://aai-app-e2e.test.com:8443/aai/v6/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>

+               <relationship-data>

+                  <relationship-key>tenant.tenant-id</relationship-key>

+                  <relationship-value>83464847234ee8937416c65507d267</relationship-value>

+               </relationship-data>

+               <related-to-property>

+                  <property-key>tenant.tenant-name</property-key>

+                  <property-value>MOG-25208-D-01</property-value>

+               </related-to-property>

+            </relationship>

+         </relationship-list>

       </volume-group>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/CreateServiceInstance/createServiceInstance_genericQueryByInstanceName_AAIResponse_200.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/CreateServiceInstance/createServiceInstance_genericQueryByInstanceName_AAIResponse_200.xml
index 742ec13..fce5afa 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/CreateServiceInstance/createServiceInstance_genericQueryByInstanceName_AAIResponse_200.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/CreateServiceInstance/createServiceInstance_genericQueryByInstanceName_AAIResponse_200.xml
@@ -1,13 +1,13 @@
-<search-results xmlns="http://com.att.aai.inventory">
-      <service-instances> 
-	   <service-instance>
-         <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>
-         <persona-model-id>gg0e927b-6087-5574-9ef8-c5e4d5847db5</persona-model-id>
-         <persona-model-version>V1.0</persona-model-version>
-         <service-instance-name>vMOG-AKRON-1234</service-instance-name>
-         <resource-version>1462561835</resource-version>
-         <relationship-list/> 
-         <metadata/> 
-		</service-instance>
-      </service-instances> 		
+<search-results xmlns="http://com.aai.inventory">

+      <service-instances> 

+	   <service-instance>

+         <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>

+         <persona-model-id>gg0e927b-6087-5574-9ef8-c5e4d5847db5</persona-model-id>

+         <persona-model-version>V1.0</persona-model-version>

+         <service-instance-name>vMOG-AKRON-1234</service-instance-name>

+         <resource-version>1462561835</resource-version>

+         <relationship-list/> 

+         <metadata/> 

+		</service-instance>

+      </service-instances> 		

       </search-results>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GENDSI_getServiceInstanceResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GENDSI_getServiceInstanceResponse.xml
index 4aeac5c..30b0afb 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GENDSI_getServiceInstanceResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/GENDSI_getServiceInstanceResponse.xml
@@ -1,35 +1,35 @@
-  <service-subscription xmlns="http://com.att.aai.inventory">
-         <service-type>SDN-ETHERNET-INTERNET</service-type>
-         <resource-version>1234</resource-version>
-         <service-instances>
-            <service-instance>
-               <service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>
-               <relationship-list>
-                  <relationship>
-                     <related-to>cvlan-tag</related-to>
-                     <related-link>https://aai-ext1.test.att.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/port-groups/port-group/slcp1447vbc.ipag/cvlan-tags/cvlan-tag/2003/</related-link>
-                     <relationship-data>
-                        <relationship-key>cvlan-tag.cvlan-tag</relationship-key>
-                        <relationship-value>2003</relationship-value>
-                     </relationship-data>
-                     <relationship-data>
-                        <relationship-key>port-group.interface-id</relationship-key>
-                        <relationship-value>slcp1447vbc.ipag</relationship-value>
-                     </relationship-data>
-                     <relationship-data>
-                        <relationship-key>vce.vnf-id</relationship-key>
-                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>
-                     </relationship-data>
-                  </relationship>
-                  <relationship>
-                     <related-to>vce</related-to>
-					 <related-link>https://aai-ext1.test.att.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/</related-link>
-                     <relationship-data>
-                        <relationship-key>vce.vnf-id</relationship-key>
-                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>
-                     </relationship-data>
-                  </relationship>
-               </relationship-list>
-            </service-instance>
-         </service-instances>
+  <service-subscription xmlns="http://com.aai.inventory">

+         <service-type>SDN-ETHERNET-INTERNET</service-type>

+         <resource-version>1234</resource-version>

+         <service-instances>

+            <service-instance>

+               <service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>

+               <relationship-list>

+                  <relationship>

+                     <related-to>cvlan-tag</related-to>

+                     <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/port-groups/port-group/slcp1447vbc.ipag/cvlan-tags/cvlan-tag/2003/</related-link>

+                     <relationship-data>

+                        <relationship-key>cvlan-tag.cvlan-tag</relationship-key>

+                        <relationship-value>2003</relationship-value>

+                     </relationship-data>

+                     <relationship-data>

+                        <relationship-key>port-group.interface-id</relationship-key>

+                        <relationship-value>slcp1447vbc.ipag</relationship-value>

+                     </relationship-data>

+                     <relationship-data>

+                        <relationship-key>vce.vnf-id</relationship-key>

+                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>

+                     </relationship-data>

+                  </relationship>

+                  <relationship>

+                     <related-to>vce</related-to>

+					 <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/</related-link>

+                     <relationship-data>

+                        <relationship-key>vce.vnf-id</relationship-key>

+                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>

+                     </relationship-data>

+                  </relationship>

+               </relationship-list>

+            </service-instance>

+         </service-instances>

       </service-subscription>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfByNameResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfByNameResponse.xml
index a397e5b..a609a35 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfByNameResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfByNameResponse.xml
@@ -1,23 +1,23 @@
-<generic-vnfs xmlns="http://com.att.aai.inventory/v3">
-         <generic-vnf>
-            <vnf-id>2f1cc940-455f-4ee2-9411-a7899cd4f124</vnf-id>
-            <vnf-name>testVnfName123</vnf-name>
-            <vnf-type>mmsc-capacity</vnf-type>
-            <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
-            <equipment-role>vMMSC</equipment-role>
-            <orchestration-status>pending-create</orchestration-status>
-            <resource-version>testReVer123</resource-version>
-            <relationship-list>
-               <relationship>
-                  <related-to>nothing</related-to>
-                  <related-link>https://aai-app-e2e.test.att.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>
-                  <relationship-data>
-                     <relationship-key>l3-network.network-id</relationship-key>
-                     <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>
-                  </relationship-data>
-               </relationship>
-            </relationship-list>
-            <l-interfaces/>
-            <lag-interfaces/>
-         </generic-vnf>
+<generic-vnfs xmlns="http://com.aai.inventory/v3">

+         <generic-vnf>

+            <vnf-id>2f1cc940-455f-4ee2-9411-a7899cd4f124</vnf-id>

+            <vnf-name>testVnfName123</vnf-name>

+            <vnf-type>mmsc-capacity</vnf-type>

+            <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

+            <equipment-role>vMMSC</equipment-role>

+            <orchestration-status>pending-create</orchestration-status>

+            <resource-version>testReVer123</resource-version>

+            <relationship-list>

+               <relationship>

+                  <related-to>nothing</related-to>

+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>

+                  <relationship-data>

+                     <relationship-key>l3-network.network-id</relationship-key>

+                     <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>

+                  </relationship-data>

+               </relationship>

+            </relationship-list>

+            <l-interfaces/>

+            <lag-interfaces/>

+         </generic-vnf>

       </generic-vnfs>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse.xml
index 3227a03..2b70f0b 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse.xml
@@ -1,90 +1,90 @@
-<generic-vnfs xmlns="http://com.att.aai.inventory/v3">
-         <generic-vnf>
-            <vnf-id>2f1cc940-455f-4ee2-9411-a7899cd4f124</vnf-id>
-            <vnf-name>testVnfName123</vnf-name>
-            <vnf-type>mmsc-capacity</vnf-type>
-            <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
-            <equipment-role>vMMSC</equipment-role>
-            <orchestration-status>pending-create</orchestration-status>
-            <relationship-list>
-               <relationship>
-                  <related-to>l3-network</related-to>
-                  <related-link>https://aai-app-e2e.test.att.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>
-                  <relationship-data>
-                     <relationship-key>l3-network.network-id</relationship-key>
-                     <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>
-                  </relationship-data>
-               </relationship>
-               <relationship>
-                  <related-to>l3-network</related-to>
-                  <related-link>https://aai-app-e2e.test.att.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/</related-link>
-                  <relationship-data>
-                     <relationship-key>l3-network.network-id</relationship-key>
-                     <relationship-value>53956c91-6e5e-49aa-88dd-535f57e66e70</relationship-value>
-                  </relationship-data>
-               </relationship>
-               <relationship>
-                  <related-to>l3-network</related-to>
-                  <related-link>https://aai-app-e2e.test.att.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/</related-link>
-                  <relationship-data>
-                     <relationship-key>l3-network.network-id</relationship-key>
-                     <relationship-value>44e0d9e0-9334-4ec6-9344-07a96dac629f</relationship-value>
-                  </relationship-data>
-               </relationship>
-               <relationship>
-                  <related-to>l3-network</related-to>
-                  <related-link>https://aai-app-e2e.test.att.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/</related-link>
-                  <relationship-data>
-                     <relationship-key>l3-network.network-id</relationship-key>
-                     <relationship-value>ac49d99b-5daf-4624-9f8e-188b126ea166</relationship-value>
-                  </relationship-data>
-               </relationship>
-            </relationship-list>
-            <l-interfaces/>
-            <lag-interfaces/>
-         </generic-vnf>
-         <generic-vnf>
-            <vnf-id>802767b3-18a6-4432-96db-25522786aee0</vnf-id>
-            <vnf-name>ZRDM1MMSC03</vnf-name>
-            <vnf-type>mmsc-capacity</vnf-type>
-            <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
-            <equipment-role>vMMSC</equipment-role>
-            <orchestration-status>pending-create</orchestration-status>
-            <relationship-list>
-               <relationship>
-                  <related-to>l3-network</related-to>
-                  <related-link>https://aai-app-e2e.test.att.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>
-                  <relationship-data>
-                     <relationship-key>l3-network.network-id</relationship-key>
-                     <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>
-                  </relationship-data>
-               </relationship>
-               <relationship>
-                  <related-to>l3-network</related-to>
-                  <related-link>https://aai-app-e2e.test.att.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/</related-link>
-                  <relationship-data>
-                     <relationship-key>l3-network.network-id</relationship-key>
-                     <relationship-value>53956c91-6e5e-49aa-88dd-535f57e66e70</relationship-value>
-                  </relationship-data>
-               </relationship>
-               <relationship>
-                  <related-to>l3-network</related-to>
-                  <related-link>https://aai-app-e2e.test.att.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/</related-link>
-                  <relationship-data>
-                     <relationship-key>l3-network.network-id</relationship-key>
-                     <relationship-value>44e0d9e0-9334-4ec6-9344-07a96dac629f</relationship-value>
-                  </relationship-data>
-               </relationship>
-               <relationship>
-                  <related-to>l3-network</related-to>
-                  <related-link>https://aai-app-e2e.test.att.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/</related-link>
-                  <relationship-data>
-                     <relationship-key>l3-network.network-id</relationship-key>
-                     <relationship-value>ac49d99b-5daf-4624-9f8e-188b126ea166</relationship-value>
-                  </relationship-data>
-               </relationship>
-            </relationship-list>
-            <l-interfaces/>
-            <lag-interfaces/>
-         </generic-vnf>
+<generic-vnfs xmlns="http://com.aai.inventory/v3">

+         <generic-vnf>

+            <vnf-id>2f1cc940-455f-4ee2-9411-a7899cd4f124</vnf-id>

+            <vnf-name>testVnfName123</vnf-name>

+            <vnf-type>mmsc-capacity</vnf-type>

+            <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

+            <equipment-role>vMMSC</equipment-role>

+            <orchestration-status>pending-create</orchestration-status>

+            <relationship-list>

+               <relationship>

+                  <related-to>l3-network</related-to>

+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>

+                  <relationship-data>

+                     <relationship-key>l3-network.network-id</relationship-key>

+                     <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>

+                  </relationship-data>

+               </relationship>

+               <relationship>

+                  <related-to>l3-network</related-to>

+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/</related-link>

+                  <relationship-data>

+                     <relationship-key>l3-network.network-id</relationship-key>

+                     <relationship-value>53956c91-6e5e-49aa-88dd-535f57e66e70</relationship-value>

+                  </relationship-data>

+               </relationship>

+               <relationship>

+                  <related-to>l3-network</related-to>

+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/</related-link>

+                  <relationship-data>

+                     <relationship-key>l3-network.network-id</relationship-key>

+                     <relationship-value>44e0d9e0-9334-4ec6-9344-07a96dac629f</relationship-value>

+                  </relationship-data>

+               </relationship>

+               <relationship>

+                  <related-to>l3-network</related-to>

+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/</related-link>

+                  <relationship-data>

+                     <relationship-key>l3-network.network-id</relationship-key>

+                     <relationship-value>ac49d99b-5daf-4624-9f8e-188b126ea166</relationship-value>

+                  </relationship-data>

+               </relationship>

+            </relationship-list>

+            <l-interfaces/>

+            <lag-interfaces/>

+         </generic-vnf>

+         <generic-vnf>

+            <vnf-id>802767b3-18a6-4432-96db-25522786aee0</vnf-id>

+            <vnf-name>ZRDM1MMSC03</vnf-name>

+            <vnf-type>mmsc-capacity</vnf-type>

+            <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

+            <equipment-role>vMMSC</equipment-role>

+            <orchestration-status>pending-create</orchestration-status>

+            <relationship-list>

+               <relationship>

+                  <related-to>l3-network</related-to>

+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>

+                  <relationship-data>

+                     <relationship-key>l3-network.network-id</relationship-key>

+                     <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>

+                  </relationship-data>

+               </relationship>

+               <relationship>

+                  <related-to>l3-network</related-to>

+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/</related-link>

+                  <relationship-data>

+                     <relationship-key>l3-network.network-id</relationship-key>

+                     <relationship-value>53956c91-6e5e-49aa-88dd-535f57e66e70</relationship-value>

+                  </relationship-data>

+               </relationship>

+               <relationship>

+                  <related-to>l3-network</related-to>

+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/</related-link>

+                  <relationship-data>

+                     <relationship-key>l3-network.network-id</relationship-key>

+                     <relationship-value>44e0d9e0-9334-4ec6-9344-07a96dac629f</relationship-value>

+                  </relationship-data>

+               </relationship>

+               <relationship>

+                  <related-to>l3-network</related-to>

+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/</related-link>

+                  <relationship-data>

+                     <relationship-key>l3-network.network-id</relationship-key>

+                     <relationship-value>ac49d99b-5daf-4624-9f8e-188b126ea166</relationship-value>

+                  </relationship-data>

+               </relationship>

+            </relationship-list>

+            <l-interfaces/>

+            <lag-interfaces/>

+         </generic-vnf>

       </generic-vnfs>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse_hasRelationships.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse_hasRelationships.xml
index 3227a03..2b70f0b 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse_hasRelationships.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse_hasRelationships.xml
@@ -1,90 +1,90 @@
-<generic-vnfs xmlns="http://com.att.aai.inventory/v3">
-         <generic-vnf>
-            <vnf-id>2f1cc940-455f-4ee2-9411-a7899cd4f124</vnf-id>
-            <vnf-name>testVnfName123</vnf-name>
-            <vnf-type>mmsc-capacity</vnf-type>
-            <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
-            <equipment-role>vMMSC</equipment-role>
-            <orchestration-status>pending-create</orchestration-status>
-            <relationship-list>
-               <relationship>
-                  <related-to>l3-network</related-to>
-                  <related-link>https://aai-app-e2e.test.att.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>
-                  <relationship-data>
-                     <relationship-key>l3-network.network-id</relationship-key>
-                     <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>
-                  </relationship-data>
-               </relationship>
-               <relationship>
-                  <related-to>l3-network</related-to>
-                  <related-link>https://aai-app-e2e.test.att.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/</related-link>
-                  <relationship-data>
-                     <relationship-key>l3-network.network-id</relationship-key>
-                     <relationship-value>53956c91-6e5e-49aa-88dd-535f57e66e70</relationship-value>
-                  </relationship-data>
-               </relationship>
-               <relationship>
-                  <related-to>l3-network</related-to>
-                  <related-link>https://aai-app-e2e.test.att.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/</related-link>
-                  <relationship-data>
-                     <relationship-key>l3-network.network-id</relationship-key>
-                     <relationship-value>44e0d9e0-9334-4ec6-9344-07a96dac629f</relationship-value>
-                  </relationship-data>
-               </relationship>
-               <relationship>
-                  <related-to>l3-network</related-to>
-                  <related-link>https://aai-app-e2e.test.att.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/</related-link>
-                  <relationship-data>
-                     <relationship-key>l3-network.network-id</relationship-key>
-                     <relationship-value>ac49d99b-5daf-4624-9f8e-188b126ea166</relationship-value>
-                  </relationship-data>
-               </relationship>
-            </relationship-list>
-            <l-interfaces/>
-            <lag-interfaces/>
-         </generic-vnf>
-         <generic-vnf>
-            <vnf-id>802767b3-18a6-4432-96db-25522786aee0</vnf-id>
-            <vnf-name>ZRDM1MMSC03</vnf-name>
-            <vnf-type>mmsc-capacity</vnf-type>
-            <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
-            <equipment-role>vMMSC</equipment-role>
-            <orchestration-status>pending-create</orchestration-status>
-            <relationship-list>
-               <relationship>
-                  <related-to>l3-network</related-to>
-                  <related-link>https://aai-app-e2e.test.att.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>
-                  <relationship-data>
-                     <relationship-key>l3-network.network-id</relationship-key>
-                     <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>
-                  </relationship-data>
-               </relationship>
-               <relationship>
-                  <related-to>l3-network</related-to>
-                  <related-link>https://aai-app-e2e.test.att.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/</related-link>
-                  <relationship-data>
-                     <relationship-key>l3-network.network-id</relationship-key>
-                     <relationship-value>53956c91-6e5e-49aa-88dd-535f57e66e70</relationship-value>
-                  </relationship-data>
-               </relationship>
-               <relationship>
-                  <related-to>l3-network</related-to>
-                  <related-link>https://aai-app-e2e.test.att.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/</related-link>
-                  <relationship-data>
-                     <relationship-key>l3-network.network-id</relationship-key>
-                     <relationship-value>44e0d9e0-9334-4ec6-9344-07a96dac629f</relationship-value>
-                  </relationship-data>
-               </relationship>
-               <relationship>
-                  <related-to>l3-network</related-to>
-                  <related-link>https://aai-app-e2e.test.att.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/</related-link>
-                  <relationship-data>
-                     <relationship-key>l3-network.network-id</relationship-key>
-                     <relationship-value>ac49d99b-5daf-4624-9f8e-188b126ea166</relationship-value>
-                  </relationship-data>
-               </relationship>
-            </relationship-list>
-            <l-interfaces/>
-            <lag-interfaces/>
-         </generic-vnf>
+<generic-vnfs xmlns="http://com.aai.inventory/v3">

+         <generic-vnf>

+            <vnf-id>2f1cc940-455f-4ee2-9411-a7899cd4f124</vnf-id>

+            <vnf-name>testVnfName123</vnf-name>

+            <vnf-type>mmsc-capacity</vnf-type>

+            <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

+            <equipment-role>vMMSC</equipment-role>

+            <orchestration-status>pending-create</orchestration-status>

+            <relationship-list>

+               <relationship>

+                  <related-to>l3-network</related-to>

+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>

+                  <relationship-data>

+                     <relationship-key>l3-network.network-id</relationship-key>

+                     <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>

+                  </relationship-data>

+               </relationship>

+               <relationship>

+                  <related-to>l3-network</related-to>

+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/</related-link>

+                  <relationship-data>

+                     <relationship-key>l3-network.network-id</relationship-key>

+                     <relationship-value>53956c91-6e5e-49aa-88dd-535f57e66e70</relationship-value>

+                  </relationship-data>

+               </relationship>

+               <relationship>

+                  <related-to>l3-network</related-to>

+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/</related-link>

+                  <relationship-data>

+                     <relationship-key>l3-network.network-id</relationship-key>

+                     <relationship-value>44e0d9e0-9334-4ec6-9344-07a96dac629f</relationship-value>

+                  </relationship-data>

+               </relationship>

+               <relationship>

+                  <related-to>l3-network</related-to>

+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/</related-link>

+                  <relationship-data>

+                     <relationship-key>l3-network.network-id</relationship-key>

+                     <relationship-value>ac49d99b-5daf-4624-9f8e-188b126ea166</relationship-value>

+                  </relationship-data>

+               </relationship>

+            </relationship-list>

+            <l-interfaces/>

+            <lag-interfaces/>

+         </generic-vnf>

+         <generic-vnf>

+            <vnf-id>802767b3-18a6-4432-96db-25522786aee0</vnf-id>

+            <vnf-name>ZRDM1MMSC03</vnf-name>

+            <vnf-type>mmsc-capacity</vnf-type>

+            <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

+            <equipment-role>vMMSC</equipment-role>

+            <orchestration-status>pending-create</orchestration-status>

+            <relationship-list>

+               <relationship>

+                  <related-to>l3-network</related-to>

+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>

+                  <relationship-data>

+                     <relationship-key>l3-network.network-id</relationship-key>

+                     <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>

+                  </relationship-data>

+               </relationship>

+               <relationship>

+                  <related-to>l3-network</related-to>

+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/</related-link>

+                  <relationship-data>

+                     <relationship-key>l3-network.network-id</relationship-key>

+                     <relationship-value>53956c91-6e5e-49aa-88dd-535f57e66e70</relationship-value>

+                  </relationship-data>

+               </relationship>

+               <relationship>

+                  <related-to>l3-network</related-to>

+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/</related-link>

+                  <relationship-data>

+                     <relationship-key>l3-network.network-id</relationship-key>

+                     <relationship-value>44e0d9e0-9334-4ec6-9344-07a96dac629f</relationship-value>

+                  </relationship-data>

+               </relationship>

+               <relationship>

+                  <related-to>l3-network</related-to>

+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/</related-link>

+                  <relationship-data>

+                     <relationship-key>l3-network.network-id</relationship-key>

+                     <relationship-value>ac49d99b-5daf-4624-9f8e-188b126ea166</relationship-value>

+                  </relationship-data>

+               </relationship>

+            </relationship-list>

+            <l-interfaces/>

+            <lag-interfaces/>

+         </generic-vnf>

       </generic-vnfs>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlById.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlById.xml
index 28ce8ef..b1f640f 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlById.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlById.xml
@@ -1,6 +1,6 @@
-    <search-results xmlns="http://com.att.aai.inventory">
-         <result-data>
-            <resource-type>service-instance</resource-type>
-            <resource-link>https://aai-ext1.test.att.com:8443/aai/v7/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET</resource-link>
-         </result-data>
+    <search-results xmlns="http://com.aai.inventory">

+         <result-data>

+            <resource-type>service-instance</resource-type>

+            <resource-link>https://aai-ext1.test.com:8443/aai/v7/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET</resource-link>

+         </result-data>

       </search-results>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlByName.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlByName.xml
index 28ce8ef..b1f640f 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlByName.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlByName.xml
@@ -1,6 +1,6 @@
-    <search-results xmlns="http://com.att.aai.inventory">
-         <result-data>
-            <resource-type>service-instance</resource-type>
-            <resource-link>https://aai-ext1.test.att.com:8443/aai/v7/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET</resource-link>
-         </result-data>
+    <search-results xmlns="http://com.aai.inventory">

+         <result-data>

+            <resource-type>service-instance</resource-type>

+            <resource-link>https://aai-ext1.test.com:8443/aai/v7/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET</resource-link>

+         </result-data>

       </search-results>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceInstance.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceInstance.xml
index 5ffdda2..84d8600 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceInstance.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceInstance.xml
@@ -1,30 +1,30 @@
-<service-instance>
-               <service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>
-               <resource-version>123456789</resource-version>
-               <relationship-list>
-                  <relationship>
-                     <related-to>cvlan-tag</related-to>
-                     <related-link>https://aai-ext1.test.att.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/port-groups/port-group/slcp1447vbc.ipag/cvlan-tags/cvlan-tag/2003/</related-link>
-                     <relationship-data>
-                        <relationship-key>cvlan-tag.cvlan-tag</relationship-key>
-                        <relationship-value>2003</relationship-value>
-                     </relationship-data>
-                     <relationship-data>
-                        <relationship-key>port-group.interface-id</relationship-key>
-                        <relationship-value>slcp1447vbc.ipag</relationship-value>
-                     </relationship-data>
-                     <relationship-data>
-                        <relationship-key>vce.vnf-id</relationship-key>
-                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>
-                     </relationship-data>
-                  </relationship>
-                  <relationship>
-                     <related-to>vce</related-to>
-					 <related-link>https://aai-ext1.test.att.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/</related-link>
-                     <relationship-data>
-                        <relationship-key>vce.vnf-id</relationship-key>
-                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>
-                     </relationship-data>
-                  </relationship>
-               </relationship-list>
+<service-instance>

+               <service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>

+               <resource-version>123456789</resource-version>

+               <relationship-list>

+                  <relationship>

+                     <related-to>cvlan-tag</related-to>

+                     <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/port-groups/port-group/slcp1447vbc.ipag/cvlan-tags/cvlan-tag/2003/</related-link>

+                     <relationship-data>

+                        <relationship-key>cvlan-tag.cvlan-tag</relationship-key>

+                        <relationship-value>2003</relationship-value>

+                     </relationship-data>

+                     <relationship-data>

+                        <relationship-key>port-group.interface-id</relationship-key>

+                        <relationship-value>slcp1447vbc.ipag</relationship-value>

+                     </relationship-data>

+                     <relationship-data>

+                        <relationship-key>vce.vnf-id</relationship-key>

+                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>

+                     </relationship-data>

+                  </relationship>

+                  <relationship>

+                     <related-to>vce</related-to>

+					 <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/</related-link>

+                     <relationship-data>

+                        <relationship-key>vce.vnf-id</relationship-key>

+                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>

+                     </relationship-data>

+                  </relationship>

+               </relationship-list>

             </service-instance>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceSubscription.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceSubscription.xml
index 41815d4..85cd5d6 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceSubscription.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceSubscription.xml
@@ -1,34 +1,34 @@
-<service-subscription xmlns="http://com.att.aai.inventory">
-     <service-type>SDN-ETHERNET-INTERNET</service-type>
-     <resource-version>1234</resource-version>
-		<service-instance>
-               <service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>
-               <resource-version>123456789</resource-version>
-               <relationship-list>
-                  <relationship>
-                     <related-to>cvlan-tag</related-to>
-                     <related-link>https://aai-ext1.test.att.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/port-groups/port-group/slcp1447vbc.ipag/cvlan-tags/cvlan-tag/2003/</related-link>
-                     <relationship-data>
-                        <relationship-key>cvlan-tag.cvlan-tag</relationship-key>
-                        <relationship-value>2003</relationship-value>
-                     </relationship-data>
-                     <relationship-data>
-                        <relationship-key>port-group.interface-id</relationship-key>
-                        <relationship-value>slcp1447vbc.ipag</relationship-value>
-                     </relationship-data>
-                     <relationship-data>
-                        <relationship-key>vce.vnf-id</relationship-key>
-                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>
-                     </relationship-data>
-                  </relationship>
-                  <relationship>
-                     <related-to>vce</related-to>
-					 <related-link>https://aai-ext1.test.att.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/</related-link>
-                     <relationship-data>
-                        <relationship-key>vce.vnf-id</relationship-key>
-                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>
-                     </relationship-data>
-                  </relationship>
-               </relationship-list>
-            </service-instance>
+<service-subscription xmlns="http://com.aai.inventory">

+     <service-type>SDN-ETHERNET-INTERNET</service-type>

+     <resource-version>1234</resource-version>

+		<service-instance>

+               <service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>

+               <resource-version>123456789</resource-version>

+               <relationship-list>

+                  <relationship>

+                     <related-to>cvlan-tag</related-to>

+                     <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/port-groups/port-group/slcp1447vbc.ipag/cvlan-tags/cvlan-tag/2003/</related-link>

+                     <relationship-data>

+                        <relationship-key>cvlan-tag.cvlan-tag</relationship-key>

+                        <relationship-value>2003</relationship-value>

+                     </relationship-data>

+                     <relationship-data>

+                        <relationship-key>port-group.interface-id</relationship-key>

+                        <relationship-value>slcp1447vbc.ipag</relationship-value>

+                     </relationship-data>

+                     <relationship-data>

+                        <relationship-key>vce.vnf-id</relationship-key>

+                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>

+                     </relationship-data>

+                  </relationship>

+                  <relationship>

+                     <related-to>vce</related-to>

+					 <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/</related-link>

+                     <relationship-data>

+                        <relationship-key>vce.vnf-id</relationship-key>

+                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>

+                     </relationship-data>

+                  </relationship>

+               </relationship-list>

+            </service-instance>

       </service-subscription>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceByNameResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceByNameResponse.xml
index a83e06e..7ada696 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceByNameResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceByNameResponse.xml
@@ -1,97 +1,97 @@
-<vce xmlns="http://com.att.aai.inventory">
-         <vnf-id>1936628a-d22f-4943-8587-a57bab2ece7a</vnf-id>
-         <vnf-name>testVnfName123</vnf-name>
-         <vnf-name2>US0112SLCP1VBRT076</vnf-name2>
-         <vnf-type>esx-vce</vnf-type>
-         <prov-status>NVTPROV</prov-status>
-         <orchestration-status>created</orchestration-status>
-         <resource-version>0000020</resource-version>
-         <heat-stack-id>slcp1476vbc/94a3c72b-94d5-444b-9a1f-647a36c2181d</heat-stack-id>
-         <mso-catalog-key/>
-         <vpe-id>VPESAT-mtanjrsv126</vpe-id>
-         <ipv4-oam-address>135.21.249.160</ipv4-oam-address>
-         <port-groups>
-            <port-group>
-               <interface-id>slcp1476vbc.vpe</interface-id>
-               <neutron-network-id>e7568706-a2a9-45f8-aef8-95a0e2910953</neutron-network-id>
-               <neutron-network-name>dvspg-VCE_VPE-slcp1476vbc</neutron-network-name>
-               <interface-role>Internet</interface-role>
-               <port-group-name>dvspg-VCE_VPE-slcp1476vbc</port-group-name>
-               <resource-version>0000020</resource-version>
-               <switch-name>dvs-slcp1-01</switch-name>
-               <orchestration-status>created</orchestration-status>
-               <heat-stack-id>dvspg-VCE_VPE-slcp1476vbc/c1299f74-da35-4228-b1e0-d2fd07176196</heat-stack-id>
-               <mso-catalog-key/>
-               <cvlan-tags>
-                  <cvlan-tag-entry>
-                     <cvlan-tag>3012</cvlan-tag>
-                     <resource-version>0000020</resource-version>
-                  </cvlan-tag-entry>
-               </cvlan-tags>
-            </port-group>
-            <port-group>
-               <interface-id>slcp1476vbc.ipag</interface-id>
-               <neutron-network-id>3477ddb6-b925-4971-ab62-c84b69634c49</neutron-network-id>
-               <neutron-network-name>dvspg-IPAG_VCE-slcp1476vbc</neutron-network-name>
-               <interface-role>Customer</interface-role>
-               <port-group-name>dvspg-IPAG_VCE-slcp1476vbc</port-group-name>
-               <switch-name>dvs-slcp1-01</switch-name>
-               <resource-version>0000020</resource-version>
-               <orchestration-status>created</orchestration-status>
-               <heat-stack-id>dvspg-IPAG_VCE-slcp1476vbc/1e9c033a-2eef-47f5-9d48-98e0b59538e7</heat-stack-id>
-               <mso-catalog-key/>
-               <cvlan-tags>
-                  <cvlan-tag-entry>
-                     <cvlan-tag>2003</cvlan-tag>
-                     <resource-version>0000020</resource-version>
-                  </cvlan-tag-entry>
-               </cvlan-tags>
-            </port-group>
-         </port-groups>
-         <relationship-list>
-            <relationship>
-               <related-to>service-instance</related-to>
-               <related-link>https://aai-ext1.test.att.com:8443/aai/v2/business/customers/customer/011216-1602-SDNC001/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET/service-instances/service-instance/SDNC%2FVLXM%2F0112001%2F%2FSW_INTERNET/</related-link>
-               <relationship-data>
-                  <relationship-key>service-instance.service-instance-id</relationship-key>
-                  <relationship-value>SDNC/VLXM/0112001//SW_INTERNET</relationship-value>
-               </relationship-data>
-               <relationship-data>
-                  <relationship-key>service-subscription.service-type</relationship-key>
-                  <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
-               </relationship-data>
-               <relationship-data>
-                  <relationship-key>customer.global-customer-id</relationship-key>
-                  <relationship-value>011216-1602-SDNC001</relationship-value>
-               </relationship-data>
-            </relationship>
-            <relationship>
-               <related-to>vserver</related-to>
-               <related-link>https://aai-ext1.test.att.com:8443/aai/servers/v2/3d5f3fe23821416fac2b69af65248c74/vservers/ecab47d5-3450-4507-ada9-2b3c58485c51/</related-link>
-               <relationship-data>
-                  <relationship-key>vserver.vserver-id</relationship-key>
-                  <relationship-value>ecab47d5-3450-4507-ada9-2b3c58485c51</relationship-value>
-               </relationship-data>
-               <relationship-data>
-                  <relationship-key>tenant.tenant-id</relationship-key>
-                  <relationship-value>3d5f3fe23821416fac2b69af65248c74</relationship-value>
-               </relationship-data>
-            </relationship>
-            <relationship>
-               <related-to>complex</related-to>
-               <related-link>https://aai-ext1.test.att.com:8443/aai/v2/cloud-infrastructure/complexes/complex/MDTWNJ21A4/</related-link>
-               <relationship-data>
-                  <relationship-key>complex.physical-location-id</relationship-key>
-                  <relationship-value>MDTWNJ21A4</relationship-value>
-               </relationship-data>
-            </relationship>
-            <relationship>
-               <related-to>availability-zone</related-to>
-               <related-link>https://aai-ext1.test.att.com:8443/aai/v2/cloud-infrastructure/availability-zones/availability-zone/slcp1-esx-az01/</related-link>
-               <relationship-data>
-                  <relationship-key>availability-zone.availability-zone-name</relationship-key>
-                  <relationship-value>slcp1-esx-az01</relationship-value>
-               </relationship-data>
-            </relationship>
-         </relationship-list>
+<vce xmlns="http://com.aai.inventory">

+         <vnf-id>1936628a-d22f-4943-8587-a57bab2ece7a</vnf-id>

+         <vnf-name>testVnfName123</vnf-name>

+         <vnf-name2>US0112SLCP1VBRT076</vnf-name2>

+         <vnf-type>esx-vce</vnf-type>

+         <prov-status>NVTPROV</prov-status>

+         <orchestration-status>created</orchestration-status>

+         <resource-version>0000020</resource-version>

+         <heat-stack-id>slcp1476vbc/94a3c72b-94d5-444b-9a1f-647a36c2181d</heat-stack-id>

+         <mso-catalog-key/>

+         <vpe-id>VPESAT-mtanjrsv126</vpe-id>

+         <ipv4-oam-address>135.21.249.160</ipv4-oam-address>

+         <port-groups>

+            <port-group>

+               <interface-id>slcp1476vbc.vpe</interface-id>

+               <neutron-network-id>e7568706-a2a9-45f8-aef8-95a0e2910953</neutron-network-id>

+               <neutron-network-name>dvspg-VCE_VPE-slcp1476vbc</neutron-network-name>

+               <interface-role>Internet</interface-role>

+               <port-group-name>dvspg-VCE_VPE-slcp1476vbc</port-group-name>

+               <resource-version>0000020</resource-version>

+               <switch-name>dvs-slcp1-01</switch-name>

+               <orchestration-status>created</orchestration-status>

+               <heat-stack-id>dvspg-VCE_VPE-slcp1476vbc/c1299f74-da35-4228-b1e0-d2fd07176196</heat-stack-id>

+               <mso-catalog-key/>

+               <cvlan-tags>

+                  <cvlan-tag-entry>

+                     <cvlan-tag>3012</cvlan-tag>

+                     <resource-version>0000020</resource-version>

+                  </cvlan-tag-entry>

+               </cvlan-tags>

+            </port-group>

+            <port-group>

+               <interface-id>slcp1476vbc.ipag</interface-id>

+               <neutron-network-id>3477ddb6-b925-4971-ab62-c84b69634c49</neutron-network-id>

+               <neutron-network-name>dvspg-IPAG_VCE-slcp1476vbc</neutron-network-name>

+               <interface-role>Customer</interface-role>

+               <port-group-name>dvspg-IPAG_VCE-slcp1476vbc</port-group-name>

+               <switch-name>dvs-slcp1-01</switch-name>

+               <resource-version>0000020</resource-version>

+               <orchestration-status>created</orchestration-status>

+               <heat-stack-id>dvspg-IPAG_VCE-slcp1476vbc/1e9c033a-2eef-47f5-9d48-98e0b59538e7</heat-stack-id>

+               <mso-catalog-key/>

+               <cvlan-tags>

+                  <cvlan-tag-entry>

+                     <cvlan-tag>2003</cvlan-tag>

+                     <resource-version>0000020</resource-version>

+                  </cvlan-tag-entry>

+               </cvlan-tags>

+            </port-group>

+         </port-groups>

+         <relationship-list>

+            <relationship>

+               <related-to>service-instance</related-to>

+               <related-link>https://aai-ext1.test.com:8443/aai/v2/business/customers/customer/011216-1602-SDNC001/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET/service-instances/service-instance/SDNC%2FVLXM%2F0112001%2F%2FSW_INTERNET/</related-link>

+               <relationship-data>

+                  <relationship-key>service-instance.service-instance-id</relationship-key>

+                  <relationship-value>SDNC/VLXM/0112001//SW_INTERNET</relationship-value>

+               </relationship-data>

+               <relationship-data>

+                  <relationship-key>service-subscription.service-type</relationship-key>

+                  <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>

+               </relationship-data>

+               <relationship-data>

+                  <relationship-key>customer.global-customer-id</relationship-key>

+                  <relationship-value>011216-1602-SDNC001</relationship-value>

+               </relationship-data>

+            </relationship>

+            <relationship>

+               <related-to>vserver</related-to>

+               <related-link>https://aai-ext1.test.com:8443/aai/servers/v2/3d5f3fe23821416fac2b69af65248c74/vservers/ecab47d5-3450-4507-ada9-2b3c58485c51/</related-link>

+               <relationship-data>

+                  <relationship-key>vserver.vserver-id</relationship-key>

+                  <relationship-value>ecab47d5-3450-4507-ada9-2b3c58485c51</relationship-value>

+               </relationship-data>

+               <relationship-data>

+                  <relationship-key>tenant.tenant-id</relationship-key>

+                  <relationship-value>3d5f3fe23821416fac2b69af65248c74</relationship-value>

+               </relationship-data>

+            </relationship>

+            <relationship>

+               <related-to>complex</related-to>

+               <related-link>https://aai-ext1.test.com:8443/aai/v2/cloud-infrastructure/complexes/complex/MDTWNJ21A4/</related-link>

+               <relationship-data>

+                  <relationship-key>complex.physical-location-id</relationship-key>

+                  <relationship-value>MDTWNJ21A4</relationship-value>

+               </relationship-data>

+            </relationship>

+            <relationship>

+               <related-to>availability-zone</related-to>

+               <related-link>https://aai-ext1.test.com:8443/aai/v2/cloud-infrastructure/availability-zones/availability-zone/slcp1-esx-az01/</related-link>

+               <relationship-data>

+                  <relationship-key>availability-zone.availability-zone-name</relationship-key>

+                  <relationship-value>slcp1-esx-az01</relationship-value>

+               </relationship-data>

+            </relationship>

+         </relationship-list>

       </vce>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceResponse.xml
index a83e06e..5dc3033 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceResponse.xml
@@ -1,97 +1,97 @@
-<vce xmlns="http://com.att.aai.inventory">
-         <vnf-id>1936628a-d22f-4943-8587-a57bab2ece7a</vnf-id>
-         <vnf-name>testVnfName123</vnf-name>
-         <vnf-name2>US0112SLCP1VBRT076</vnf-name2>
-         <vnf-type>esx-vce</vnf-type>
-         <prov-status>NVTPROV</prov-status>
-         <orchestration-status>created</orchestration-status>
-         <resource-version>0000020</resource-version>
-         <heat-stack-id>slcp1476vbc/94a3c72b-94d5-444b-9a1f-647a36c2181d</heat-stack-id>
-         <mso-catalog-key/>
-         <vpe-id>VPESAT-mtanjrsv126</vpe-id>
-         <ipv4-oam-address>135.21.249.160</ipv4-oam-address>
-         <port-groups>
-            <port-group>
-               <interface-id>slcp1476vbc.vpe</interface-id>
-               <neutron-network-id>e7568706-a2a9-45f8-aef8-95a0e2910953</neutron-network-id>
-               <neutron-network-name>dvspg-VCE_VPE-slcp1476vbc</neutron-network-name>
-               <interface-role>Internet</interface-role>
-               <port-group-name>dvspg-VCE_VPE-slcp1476vbc</port-group-name>
-               <resource-version>0000020</resource-version>
-               <switch-name>dvs-slcp1-01</switch-name>
-               <orchestration-status>created</orchestration-status>
-               <heat-stack-id>dvspg-VCE_VPE-slcp1476vbc/c1299f74-da35-4228-b1e0-d2fd07176196</heat-stack-id>
-               <mso-catalog-key/>
-               <cvlan-tags>
-                  <cvlan-tag-entry>
-                     <cvlan-tag>3012</cvlan-tag>
-                     <resource-version>0000020</resource-version>
-                  </cvlan-tag-entry>
-               </cvlan-tags>
-            </port-group>
-            <port-group>
-               <interface-id>slcp1476vbc.ipag</interface-id>
-               <neutron-network-id>3477ddb6-b925-4971-ab62-c84b69634c49</neutron-network-id>
-               <neutron-network-name>dvspg-IPAG_VCE-slcp1476vbc</neutron-network-name>
-               <interface-role>Customer</interface-role>
-               <port-group-name>dvspg-IPAG_VCE-slcp1476vbc</port-group-name>
-               <switch-name>dvs-slcp1-01</switch-name>
-               <resource-version>0000020</resource-version>
-               <orchestration-status>created</orchestration-status>
-               <heat-stack-id>dvspg-IPAG_VCE-slcp1476vbc/1e9c033a-2eef-47f5-9d48-98e0b59538e7</heat-stack-id>
-               <mso-catalog-key/>
-               <cvlan-tags>
-                  <cvlan-tag-entry>
-                     <cvlan-tag>2003</cvlan-tag>
-                     <resource-version>0000020</resource-version>
-                  </cvlan-tag-entry>
-               </cvlan-tags>
-            </port-group>
-         </port-groups>
-         <relationship-list>
-            <relationship>
-               <related-to>service-instance</related-to>
-               <related-link>https://aai-ext1.test.att.com:8443/aai/v2/business/customers/customer/011216-1602-SDNC001/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET/service-instances/service-instance/SDNC%2FVLXM%2F0112001%2F%2FSW_INTERNET/</related-link>
-               <relationship-data>
-                  <relationship-key>service-instance.service-instance-id</relationship-key>
-                  <relationship-value>SDNC/VLXM/0112001//SW_INTERNET</relationship-value>
-               </relationship-data>
-               <relationship-data>
-                  <relationship-key>service-subscription.service-type</relationship-key>
-                  <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
-               </relationship-data>
-               <relationship-data>
-                  <relationship-key>customer.global-customer-id</relationship-key>
-                  <relationship-value>011216-1602-SDNC001</relationship-value>
-               </relationship-data>
-            </relationship>
-            <relationship>
-               <related-to>vserver</related-to>
-               <related-link>https://aai-ext1.test.att.com:8443/aai/servers/v2/3d5f3fe23821416fac2b69af65248c74/vservers/ecab47d5-3450-4507-ada9-2b3c58485c51/</related-link>
-               <relationship-data>
-                  <relationship-key>vserver.vserver-id</relationship-key>
-                  <relationship-value>ecab47d5-3450-4507-ada9-2b3c58485c51</relationship-value>
-               </relationship-data>
-               <relationship-data>
-                  <relationship-key>tenant.tenant-id</relationship-key>
-                  <relationship-value>3d5f3fe23821416fac2b69af65248c74</relationship-value>
-               </relationship-data>
-            </relationship>
-            <relationship>
-               <related-to>complex</related-to>
-               <related-link>https://aai-ext1.test.att.com:8443/aai/v2/cloud-infrastructure/complexes/complex/MDTWNJ21A4/</related-link>
-               <relationship-data>
-                  <relationship-key>complex.physical-location-id</relationship-key>
-                  <relationship-value>MDTWNJ21A4</relationship-value>
-               </relationship-data>
-            </relationship>
-            <relationship>
-               <related-to>availability-zone</related-to>
-               <related-link>https://aai-ext1.test.att.com:8443/aai/v2/cloud-infrastructure/availability-zones/availability-zone/slcp1-esx-az01/</related-link>
-               <relationship-data>
-                  <relationship-key>availability-zone.availability-zone-name</relationship-key>
-                  <relationship-value>slcp1-esx-az01</relationship-value>
-               </relationship-data>
-            </relationship>
-         </relationship-list>
+<vce xmlns="http://com.aai.inventory">

+         <vnf-id>1936628a-d22f-4943-8587-a57bab2ece7a</vnf-id>

+         <vnf-name>testVnfName123</vnf-name>

+         <vnf-name2>US0112SLCP1VBRT076</vnf-name2>

+         <vnf-type>esx-vce</vnf-type>

+         <prov-status>NVTPROV</prov-status>

+         <orchestration-status>created</orchestration-status>

+         <resource-version>0000020</resource-version>

+         <heat-stack-id>slcp1476vbc/94a3c72b-94d5-444b-9a1f-647a36c2181d</heat-stack-id>

+         <mso-catalog-key/>

+         <vpe-id>VPESAT-mtanjrsv126</vpe-id>

+         <ipv4-oam-address>135.21.249.160</ipv4-oam-address>

+         <port-groups>

+            <port-group>

+               <interface-id>slcp1476vbc.vpe</interface-id>

+               <neutron-network-id>e7568706-a2a9-45f8-aef8-95a0e2910953</neutron-network-id>

+               <neutron-network-name>dvspg-VCE_VPE-slcp1476vbc</neutron-network-name>

+               <interface-role>Internet</interface-role>

+               <port-group-name>dvspg-VCE_VPE-slcp1476vbc</port-group-name>

+               <resource-version>0000020</resource-version>

+               <switch-name>dvs-slcp1-01</switch-name>

+               <orchestration-status>created</orchestration-status>

+               <heat-stack-id>dvspg-VCE_VPE-slcp1476vbc/c1299f74-da35-4228-b1e0-d2fd07176196</heat-stack-id>

+               <mso-catalog-key/>

+               <cvlan-tags>

+                  <cvlan-tag-entry>

+                     <cvlan-tag>3012</cvlan-tag>

+                     <resource-version>0000020</resource-version>

+                  </cvlan-tag-entry>

+               </cvlan-tags>

+            </port-group>

+            <port-group>

+               <interface-id>slcp1476vbc.ipag</interface-id>

+               <neutron-network-id>3477ddb6-b925-4971-ab62-c84b69634c49</neutron-network-id>

+               <neutron-network-name>dvspg-IPAG_VCE-slcp1476vbc</neutron-network-name>

+               <interface-role>Customer</interface-role>

+               <port-group-name>dvspg-IPAG_VCE-slcp1476vbc</port-group-name>

+               <switch-name>dvs-slcp1-01</switch-name>

+               <resource-version>0000020</resource-version>

+               <orchestration-status>created</orchestration-status>

+               <heat-stack-id>dvspg-IPAG_VCE-slcp1476vbc/1e9c033a-2eef-47f5-9d48-98e0b59538e7</heat-stack-id>

+               <mso-catalog-key/>

+               <cvlan-tags>

+                  <cvlan-tag-entry>

+                     <cvlan-tag>2003</cvlan-tag>

+                     <resource-version>0000020</resource-version>

+                  </cvlan-tag-entry>

+               </cvlan-tags>

+            </port-group>

+         </port-groups>

+         <relationship-list>

+            <relationship>

+               <related-to>service-instance</related-to>

+               <related-link>https://aai-ext1.test.com:8443/aai/v2/business/customers/customer/011216-1602-SDNC001/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET/service-instances/service-instance/SDNC%2FVLXM%2F0112001%2F%2FSW_INTERNET/</related-link>

+               <relationship-data>

+                  <relationship-key>service-instance.service-instance-id</relationship-key>

+                  <relationship-value>SDNC/VLXM/0112001//SW_INTERNET</relationship-value>

+               </relationship-data>

+               <relationship-data>

+                  <relationship-key>service-subscription.service-type</relationship-key>

+                  <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>

+               </relationship-data>

+               <relationship-data>

+                  <relationship-key>customer.global-customer-id</relationship-key>

+                  <relationship-value>011216-1602-SDNC001</relationship-value>

+               </relationship-data>

+            </relationship>

+            <relationship>

+               <related-to>vserver</related-to>

+               <related-link>https://aai-ext1.test.com:8443/aai/servers/v2/3d5f3fe23821416fac2b69af65248c74/vservers/ecab47d5-3450-4507-ada9-2b3c58485c51/</related-link>

+               <relationship-data>

+                  <relationship-key>vserver.vserver-id</relationship-key>

+                  <relationship-value>ecab47d5-3450-4507-ada9-2b3c58485c51</relationship-value>

+               </relationship-data>

+               <relationship-data>

+                  <relationship-key>tenant.tenant-id</relationship-key>

+                  <relationship-value>3d5f3fe23821416fac2b69af65248c74</relationship-value>

+               </relationship-data>

+            </relationship>

+            <relationship>

+               <related-to>complex</related-to>

+               <related-link>https://aai-ext1.test.com:8443/aai/v2/cloud-infrastructure/complexes/complex/MDTWNJ21A4/</related-link>

+               <relationship-data>

+                  <relationship-key>complex.physical-location-id</relationship-key>

+                  <relationship-value>MDTWNJ21A4</relationship-value>

+               </relationship-data>

+            </relationship>

+            <relationship>

+               <related-to>availability-zone</related-to>

+               <related-link>https://aai-ext1.test..com:8443/aai/v2/cloud-infrastructure/availability-zones/availability-zone/slcp1-esx-az01/</related-link>

+               <relationship-data>

+                  <relationship-key>availability-zone.availability-zone-name</relationship-key>

+                  <relationship-value>slcp1-esx-az01</relationship-value>

+               </relationship-data>

+            </relationship>

+         </relationship-list>

       </vce>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/SDN-ETHERNET-INTERNET/SDNCAdapterV1mock/sdncadaptercallbackrequest.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/SDN-ETHERNET-INTERNET/SDNCAdapterV1mock/sdncadaptercallbackrequest.xml
index b720047..3d1e039 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/SDN-ETHERNET-INTERNET/SDNCAdapterV1mock/sdncadaptercallbackrequest.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/SDN-ETHERNET-INTERNET/SDNCAdapterV1mock/sdncadaptercallbackrequest.xml
@@ -1,350 +1,350 @@
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-	xmlns:v1="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
-	<soapenv:Header />
-	<soapenv:Body>
-		<v1:SDNCAdapterCallback>
-<SDNCAdapterCallbackRequest xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
-    <CallbackHeader>
-        <RequestId>testRequestId</RequestId>
-        <ResponseCode>200</ResponseCode>
-        <ResponseMessage>OK</ResponseMessage>
-    </CallbackHeader>
-    <RequestData xsi:type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">				&lt;layer3-service-list xmlns="com:att:sdnctl:l3api"&gt;
-					&lt;service-instance-id&gt;FK/VLXM/003717//SW_INTERNET&lt;/service-instance-id&gt;
-					&lt;service-status&gt;
-						&lt;rpc-name&gt;service-configuration-operation&lt;/rpc-name&gt;
-						&lt;rpc-action&gt;activate&lt;/rpc-action&gt;
-						&lt;request-status&gt;synccomplete&lt;/request-status&gt;
-						&lt;final-indicator&gt;N&lt;/final-indicator&gt;
-						&lt;l3sdn-action&gt;Layer3ServiceActivateRequest&lt;/l3sdn-action&gt;
-						&lt;l3sdn-subaction&gt;SUPP&lt;/l3sdn-subaction&gt;
-						&lt;response-timestamp&gt;2015-04-28T21:32:11.386Z&lt;/response-timestamp&gt;
-					&lt;/service-status&gt;
-					&lt;service-data&gt;
-						&lt;internet-evc-access-information&gt;
-							&lt;ip-version&gt;ds&lt;/ip-version&gt;
-							&lt;internet-evc-speed-value&gt;8&lt;/internet-evc-speed-value&gt;
-							&lt;internet-evc-speed-units&gt;Mbps&lt;/internet-evc-speed-units&gt;
-						&lt;/internet-evc-access-information&gt;
-						&lt;vr-lan xmlns="com:att:sdnctl:l3api"&gt;
-							&lt;vr-lan-interface&gt;
-								&lt;static-routes&gt;
-									&lt;v6-static-routes&gt;
-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
-										&lt;v6-static-route-prefix&gt;2001:1890:12e3:2da::&lt;/v6-static-route-prefix&gt;
-										&lt;v6-static-route-prefix-length&gt;28&lt;/v6-static-route-prefix-length&gt;
-									&lt;/v6-static-routes&gt;
-									&lt;v4-static-routes&gt;
-										&lt;v4-static-route-prefix&gt;255.255.252.1&lt;/v4-static-route-prefix&gt;
-										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;
-										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;
-									&lt;/v4-static-routes&gt;
-									&lt;v6-static-routes&gt;
-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
-										&lt;v6-static-route-prefix&gt;2001:1890:12e3:2da::&lt;/v6-static-route-prefix&gt;
-										&lt;v6-static-route-prefix-length&gt;28&lt;/v6-static-route-prefix-length&gt;
-									&lt;/v6-static-routes&gt;
-									&lt;v4-static-routes&gt;
-										&lt;v4-static-route-prefix&gt;255.255.252.2&lt;/v4-static-route-prefix&gt;
-										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;
-										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;
-									&lt;/v4-static-routes&gt;
-									&lt;v4-static-routes&gt;
-										&lt;v4-static-route-prefix&gt;255.255.252.3&lt;/v4-static-route-prefix&gt;
-										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;
-										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;
-									&lt;/v4-static-routes&gt;
-								&lt;/static-routes&gt;
-								&lt;dhcp&gt;
-									&lt;v6-dhcp-server-enabled&gt;N&lt;/v6-dhcp-server-enabled&gt;
-									&lt;v4-dhcp-server-enabled&gt;Y&lt;/v4-dhcp-server-enabled&gt;
-									&lt;use-v6-default-pool&gt;N&lt;/use-v6-default-pool&gt;
-									&lt;excluded-v4-dhcp-addresses-from-default-pool&gt;
-									  &lt;excluded-v4-address&gt;192.168.1.7&lt;/excluded-v4-address&gt;
-									&lt;/excluded-v4-dhcp-addresses-from-default-pool&gt;
-									&lt;excluded-v4-dhcp-addresses-from-default-pool&gt;
-									  &lt;excluded-v4-address&gt;192.168.1.8&lt;/excluded-v4-address&gt;
-									&lt;/excluded-v4-dhcp-addresses-from-default-pool&gt;
-									&lt;v4-dhcp-pools&gt;
-										&lt;v4-dhcp-relay-next-hop-address&gt;1.1.1.1&lt;/v4-dhcp-relay-next-hop-address&gt;
-										&lt;v4-dhcp-pool-prefix-length&gt;28&lt;/v4-dhcp-pool-prefix-length&gt;
-										&lt;excluded-v4-addresses&gt;
-											&lt;excluded-v4-address&gt;192.168.1.5&lt;/excluded-v4-address&gt;
-										&lt;/excluded-v4-addresses&gt;
-										&lt;v4-dhcp-relay-gateway-address&gt;2.2.2.1&lt;/v4-dhcp-relay-gateway-address&gt;
-										&lt;excluded-v4-addresses&gt;
-											&lt;excluded-v4-address&gt;192.168.1.6&lt;/excluded-v4-address&gt;
-										&lt;/excluded-v4-addresses&gt;
-										&lt;v4-dhcp-pool-prefix&gt;192.155.2.3&lt;/v4-dhcp-pool-prefix&gt;
-									&lt;/v4-dhcp-pools&gt;
-									&lt;v4-dhcp-pools&gt;
-										&lt;v4-dhcp-relay-next-hop-address&gt;1.1.1.2&lt;/v4-dhcp-relay-next-hop-address&gt;
-										&lt;v4-dhcp-pool-prefix-length&gt;28&lt;/v4-dhcp-pool-prefix-length&gt;
-										&lt;excluded-v4-addresses&gt;
-											&lt;excluded-v4-address&gt;192.168.1.6&lt;/excluded-v4-address&gt;
-										&lt;/excluded-v4-addresses&gt;
-										&lt;v4-dhcp-relay-gateway-address&gt;2.2.2.2&lt;/v4-dhcp-relay-gateway-address&gt;
-										&lt;excluded-v4-addresses&gt;
-											&lt;excluded-v4-address&gt;192.168.1.7&lt;/excluded-v4-address&gt;
-										&lt;/excluded-v4-addresses&gt;
-										&lt;v4-dhcp-pool-prefix&gt;192.155.2.4&lt;/v4-dhcp-pool-prefix&gt;
-									&lt;/v4-dhcp-pools&gt;									
-									&lt;use-v4-default-pool&gt;Y&lt;/use-v4-default-pool&gt;
-									&lt;excluded-v6-dhcp-addresses-from-default-pool&gt;
-									  &lt;excluded-v6-address&gt;1:5&lt;/excluded-v6-address&gt;
-									&lt;/excluded-v6-dhcp-addresses-from-default-pool&gt;
-									&lt;excluded-v6-dhcp-addresses-from-default-pool&gt;
-									  &lt;excluded-v6-address&gt;1:6&lt;/excluded-v6-address&gt;
-									&lt;/excluded-v6-dhcp-addresses-from-default-pool&gt;
-									&lt;v6-dhcp-pools&gt;
-										&lt;v6-dhcp-relay-next-hop-address&gt;4:4&lt;/v6-dhcp-relay-next-hop-address&gt;
-										&lt;v6-dhcp-pool-prefix-length&gt;28&lt;/v6-dhcp-pool-prefix-length&gt;
-										&lt;excluded-v6-addresses&gt;
-											&lt;excluded-v6-address&gt;1:1&lt;/excluded-v6-address&gt;
-										&lt;/excluded-v6-addresses&gt;
-										&lt;v6-dhcp-relay-gateway-address&gt;3:3&lt;/v6-dhcp-relay-gateway-address&gt;
-										&lt;excluded-v6-addresses&gt;
-											&lt;excluded-v6-address&gt;2:2&lt;/excluded-v6-address&gt;
-										&lt;/excluded-v6-addresses&gt;
-										&lt;v6-dhcp-pool-prefix&gt;0:0&lt;/v6-dhcp-pool-prefix&gt;
-									&lt;/v6-dhcp-pools&gt;
-									&lt;v6-dhcp-pools&gt;
-										&lt;v6-dhcp-relay-next-hop-address&gt;4:4&lt;/v6-dhcp-relay-next-hop-address&gt;
-										&lt;v6-dhcp-pool-prefix-length&gt;28&lt;/v6-dhcp-pool-prefix-length&gt;
-										&lt;excluded-v6-addresses&gt;
-											&lt;excluded-v6-address&gt;1:1&lt;/excluded-v6-address&gt;
-										&lt;/excluded-v6-addresses&gt;
-										&lt;v6-dhcp-relay-gateway-address&gt;3:3&lt;/v6-dhcp-relay-gateway-address&gt;
-										&lt;excluded-v6-addresses&gt;
-											&lt;excluded-v6-address&gt;2:2&lt;/excluded-v6-address&gt;
-										&lt;/excluded-v6-addresses&gt;
-										&lt;v6-dhcp-pool-prefix&gt;0:0&lt;/v6-dhcp-pool-prefix&gt;
-									&lt;/v6-dhcp-pools&gt;									
-								&lt;/dhcp&gt;
-								&lt;firewall-lite&gt;
-									&lt;stateful-firewall-lite-v6-enabled&gt;N&lt;/stateful-firewall-lite-v6-enabled&gt;
-									&lt;stateful-firewall-lite-v4-enabled&gt;Y&lt;/stateful-firewall-lite-v4-enabled&gt;
-									&lt;v4-firewall-packet-filters&gt;
-									  &lt;v4-firewall-prefix&gt;0.0.0.1&lt;/v4-firewall-prefix&gt;
-									  &lt;v4-firewall-prefix-length&gt;1&lt;/v4-firewall-prefix-length&gt;
-									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;
-									  &lt;udp-ports&gt;
-									    &lt;port-number&gt;1&lt;/port-number&gt;
-									  &lt;/udp-ports&gt;
-									  &lt;tcp-ports&gt;
-									    &lt;port-number&gt;1&lt;/port-number&gt;
-									  &lt;/tcp-ports&gt;
-									&lt;/v4-firewall-packet-filters&gt;
-									&lt;v4-firewall-packet-filters&gt;
-									  &lt;v4-firewall-prefix&gt;0.0.0.2&lt;/v4-firewall-prefix&gt;
-									  &lt;v4-firewall-prefix-length&gt;2&lt;/v4-firewall-prefix-length&gt;
-									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;
-									  &lt;udp-ports&gt;
-									    &lt;port-number&gt;2&lt;/port-number&gt;
-									  &lt;/udp-ports&gt;
-									  &lt;tcp-ports&gt;
-									    &lt;port-number&gt;2&lt;/port-number&gt;
-									  &lt;/tcp-ports&gt;
-									&lt;/v4-firewall-packet-filters&gt;
-									&lt;v6-firewall-packet-filters&gt;
-									  &lt;v6-firewall-prefix&gt;:&lt;/v6-firewall-prefix&gt;
-									  &lt;v6-firewall-prefix-length&gt;0&lt;/v6-firewall-prefix-length&gt;
-									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;
-									  &lt;udp-ports&gt;
-									    &lt;port-number&gt;3&lt;/port-number&gt;
-									  &lt;/udp-ports&gt;
-									  &lt;tcp-ports&gt;
-									    &lt;port-number&gt;3&lt;/port-number&gt;
-									  &lt;/tcp-ports&gt;
-									&lt;/v6-firewall-packet-filters&gt;
-									&lt;v6-firewall-packet-filters&gt;
-									  &lt;v6-firewall-prefix&gt;:&lt;/v6-firewall-prefix&gt;
-									  &lt;v6-firewall-prefix-length&gt;1&lt;/v6-firewall-prefix-length&gt;
-									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;
-									  &lt;udp-ports&gt;
-									    &lt;port-number&gt;4&lt;/port-number&gt;
-									  &lt;/udp-ports&gt;
-									  &lt;tcp-ports&gt;
-									    &lt;port-number&gt;4&lt;/port-number&gt;
-									  &lt;/tcp-ports&gt;
-									&lt;/v6-firewall-packet-filters&gt;
-								&lt;/firewall-lite&gt;
-								&lt;pat&gt;
-									&lt;v4-pat-pools&gt;
-										&lt;v4-pat-pool-prefix&gt;192.168.1.44&lt;/v4-pat-pool-prefix&gt;
-										&lt;v4-pat-pool-next-hop-address&gt;192.168.1.5&lt;/v4-pat-pool-next-hop-address&gt;
-										&lt;v4-pat-pool-prefix-length&gt;0&lt;/v4-pat-pool-prefix-length&gt;
-									&lt;/v4-pat-pools&gt;
-									&lt;use-v4-default-pool&gt;Y&lt;/use-v4-default-pool&gt;
-									&lt;v4-pat-enabled&gt;N&lt;/v4-pat-enabled&gt;
-									&lt;v4-pat-pools&gt;
-										&lt;v4-pat-pool-prefix&gt;192.168.1.45&lt;/v4-pat-pool-prefix&gt;
-										&lt;v4-pat-pool-next-hop-address&gt;192.168.1.6&lt;/v4-pat-pool-next-hop-address&gt;
-										&lt;v4-pat-pool-prefix-length&gt;28&lt;/v4-pat-pool-prefix-length&gt;
-									&lt;/v4-pat-pools&gt;
-								&lt;/pat&gt;
-								&lt;nat&gt;
-								  &lt;v4-nat-enabled&gt;Y&lt;/v4-nat-enabled&gt;
-								  &lt;v4-nat-mapping-entries&gt;
-								    &lt;v4-nat-internal&gt;0.0.0.0&lt;/v4-nat-internal&gt;
-								    &lt;v4-nat-next-hop-address&gt;0.0.0.0&lt;/v4-nat-next-hop-address&gt;
-								    &lt;v4-nat-external&gt;0.0.0.0&lt;/v4-nat-external&gt;
-								  &lt;/v4-nat-mapping-entries&gt;
-								  &lt;v4-nat-mapping-entries&gt;
-								    &lt;v4-nat-internal&gt;0.0.0.1&lt;/v4-nat-internal&gt;
-								    &lt;v4-nat-next-hop-address&gt;0.0.0.1&lt;/v4-nat-next-hop-address&gt;
-								    &lt;v4-nat-external&gt;0.0.0.1&lt;/v4-nat-external&gt;
-								  &lt;/v4-nat-mapping-entries&gt;
-								&lt;/nat&gt;
-								&lt;vr-designation&gt;primary&lt;/vr-designation&gt;
-								&lt;v4-vce-loopback-address&gt;162.200.3.144&lt;/v4-vce-loopback-address&gt;
-								&lt;v6-vr-lan-prefix-length&gt;64&lt;/v6-vr-lan-prefix-length&gt;
-								&lt;v6-vce-wan-address&gt;2001:1890:12e3:2da::&lt;/v6-vce-wan-address&gt;
-								&lt;v6-vr-lan-prefix&gt;2620:0:10d0:f:ffff:ffff:ffff:fffe&lt;/v6-vr-lan-prefix&gt;
-								&lt;v4-vr-lan-prefix-length&gt;24&lt;/v4-vr-lan-prefix-length&gt;
-								&lt;v4-vr-lan-prefix&gt;10.192.27.254&lt;/v4-vr-lan-prefix&gt;
-								&lt;v4-public-lan-prefixes&gt;
-									&lt;t-provided-v4-lan-public-prefixes&gt;
-										&lt;request-index&gt;1&lt;/request-index&gt;
-										&lt;v4-next-hop-address&gt;192.168.1.2&lt;/v4-next-hop-address&gt;
-										&lt;v4-lan-public-prefix&gt;192.168.1.1&lt;/v4-lan-public-prefix&gt;
-										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
-									&lt;/t-provided-v4-lan-public-prefixes&gt;
-									&lt;t-provided-v4-lan-public-prefixes&gt;
-										&lt;request-index&gt;1&lt;/request-index&gt;
-										&lt;v4-next-hop-address&gt;192.168.1.72&lt;/v4-next-hop-address&gt;
-										&lt;v4-lan-public-prefix&gt;192.168.1.71&lt;/v4-lan-public-prefix&gt;
-										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
-									&lt;/t-provided-v4-lan-public-prefixes&gt;
-									&lt;t-provided-v4-lan-public-prefixes&gt;
-										&lt;request-index&gt;1&lt;/request-index&gt;
-										&lt;v4-next-hop-address&gt;192.168.1.68&lt;/v4-next-hop-address&gt;
-										&lt;v4-lan-public-prefix&gt;192.168.1.67&lt;/v4-lan-public-prefix&gt;
-										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
-									&lt;/t-provided-v4-lan-public-prefixes&gt;
-								&lt;/v4-public-lan-prefixes&gt;
-								&lt;v6-public-lan-prefixes&gt;
-									&lt;t-provided-v6-lan-public-prefixes&gt;
-										&lt;request-index&gt;1&lt;/request-index&gt;
-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
-										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;
-										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
-									&lt;/t-provided-v6-lan-public-prefixes&gt;
-									&lt;t-provided-v6-lan-public-prefixes&gt;
-										&lt;request-index&gt;1&lt;/request-index&gt;
-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
-										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:3da::&lt;/v6-lan-public-prefix&gt;
-										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
-									&lt;/t-provided-v6-lan-public-prefixes&gt;
-									&lt;t-provided-v6-lan-public-prefixes&gt;
-										&lt;request-index&gt;1&lt;/request-index&gt;
-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
-										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:4da::&lt;/v6-lan-public-prefix&gt;
-										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
-									&lt;/t-provided-v6-lan-public-prefixes&gt;
-								&lt;/v6-public-lan-prefixes&gt;
-							&lt;/vr-lan-interface&gt;
-							&lt;routing-protocol&gt;none&lt;/routing-protocol&gt;
-						&lt;/vr-lan&gt;
-&lt;ucpe-vms-service-information&gt;				
- &lt;transport-service-information&gt;
-    &lt;transport-service-type&gt;AVPN&lt;/transport-service-type&gt;
-	&lt;access-circuit-info&gt;
-	   &lt;access-circuit-id&gt;1&lt;/access-circuit-id&gt;
-	   &lt;dual-mode&gt;Active&lt;/dual-mode&gt;
-	&lt;/access-circuit-info&gt;
-	&lt;access-circuit-info&gt;
-	   &lt;access-circuit-id&gt;2&lt;/access-circuit-id&gt;
-	   &lt;dual-mode&gt;Standby&lt;/dual-mode&gt;
-	&lt;/access-circuit-info&gt;	
- &lt;/transport-service-information&gt;
- &lt;ucpe-information&gt;
-    &lt;ucpe-host-name&gt;hostname&lt;/ucpe-host-name&gt;
-    &lt;ucpe-activation-code&gt;activecode&lt;/ucpe-activation-code&gt;
-    &lt;out-of-band-management-modem&gt;OOB&lt;/out-of-band-management-modem&gt;
-  &lt;/ucpe-information&gt;
-  &lt;vnf-list&gt;
-	&lt;vnf-information&gt; 
-		&lt;vnf-instance-id&gt;1&lt;/vnf-instance-id&gt; 
-		&lt;vnf-sequence-number&gt;1&lt;/vnf-sequence-number&gt;
-		&lt;vnf-type&gt;ZZ&lt;/vnf-type&gt;
-		&lt;vnf-vendor&gt;JUNIPER&lt;/vnf-vendor&gt;
-		&lt;vnf-model&gt;MODEL1&lt;/vnf-model&gt;
-		&lt;vnf-id&gt;1&lt;/vnf-id&gt;
-		&lt;prov-status&gt;1&lt;/prov-status&gt;
-		&lt;operational-state&gt;1&lt;/operational-state&gt;
-		&lt;orchestration-status&gt;1&lt;/orchestration-status&gt;
-		&lt;equipment-role&gt;1&lt;/equipment-role&gt;
-    &lt;/vnf-information&gt;
-	&lt;vnf-information&gt; 
-		&lt;vnf-instance-id&gt;2&lt;/vnf-instance-id&gt; 
-		&lt;vnf-sequence-number&gt;2&lt;/vnf-sequence-number&gt;
-		&lt;vnf-type&gt;HY&lt;/vnf-type&gt;
-		&lt;vnf-vendor&gt;JUNIPER&lt;/vnf-vendor&gt;
-		&lt;vnf-model&gt;MODEL2&lt;/vnf-model&gt;
-		&lt;vnf-id&gt;2&lt;/vnf-id&gt;
-		&lt;prov-status&gt;2&lt;/prov-status&gt;
-		&lt;operational-state&gt;2&lt;/operational-state&gt;
-		&lt;orchestration-status&gt;2&lt;/orchestration-status&gt;
-		&lt;equipment-role&gt;2&lt;/equipment-role&gt;
-    &lt;/vnf-information&gt;					
-  &lt;/vnf-list&gt;
- &lt;/ucpe-vms-service-information&gt;										
-						&lt;request-information&gt;
-							&lt;request-action&gt;Layer3ServiceActivateRequest&lt;/request-action&gt;
-							&lt;order-number&gt;4281555&lt;/order-number&gt;
-							&lt;request-id&gt;155415ab-b4a7-4382-b4c6-d17d9sm42855&lt;/request-id&gt;
-							&lt;notification-url&gt;https://csi-tst-q22.it.att.com:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws&lt;/notification-url&gt;
-							&lt;source&gt;OMX&lt;/source&gt;
-							&lt;order-version&gt;1&lt;/order-version&gt;
-						&lt;/request-information&gt;
-						&lt;sdnc-request-header&gt;
-							&lt;svc-action&gt;activate&lt;/svc-action&gt;
-							&lt;svc-notification-url&gt;https://msojra.mtsnjdcp1.aic.cip.att.com:8443/adapters/rest/SDNCNotify&lt;/svc-notification-url&gt;
-							&lt;svc-request-id&gt;5b1f3c5d-cdf9-488d-8a4b-d3f1229d7760&lt;/svc-request-id&gt;
-						&lt;/sdnc-request-header&gt;
-						&lt;l2-homing-information&gt;
-							&lt;topology&gt;MultiPoint&lt;/topology&gt;
-							&lt;preferred-aic-clli&gt;MTSNJA4LCP1&lt;/preferred-aic-clli&gt;
-							&lt;evc-name&gt;AS/VLXM/003717//SW&lt;/evc-name&gt;
-						&lt;/l2-homing-information&gt;
-						&lt;service-information&gt;
-							&lt;service-instance-id&gt;FK/VLXM/003717//SW_INTERNET&lt;/service-instance-id&gt;
-							&lt;subscriber-name&gt;ST E2E Test42855_1300004281555&lt;/subscriber-name&gt;
-							&lt;service-type&gt;SDN-ETHERNET-INTERNET&lt;/service-type&gt;
-						&lt;/service-information&gt;
-						&lt;internet-service-change-details&gt;
-							&lt;internet-evc-speed-value&gt;10&lt;/internet-evc-speed-value&gt;
-							&lt;internet-evc-speed-units&gt;Kbps&lt;/internet-evc-speed-units&gt;
-							&lt;t-provided-v4-lan-public-prefixes&gt;
-							   &lt;request-index&gt;1&lt;/request-index&gt;
-							   &lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;
-							   &lt;v4-lan-public-prefix&gt;192.168.1.15&lt;/v4-lan-public-prefix&gt;
-							   &lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
-							&lt;/t-provided-v4-lan-public-prefixes&gt;
-							&lt;t-provided-v4-lan-public-prefixes&gt;
-							   &lt;request-index&gt;2&lt;/request-index&gt;
-							   &lt;v4-next-hop-address&gt;192.168.1.16&lt;/v4-next-hop-address&gt;
-							   &lt;v4-lan-public-prefix&gt;192.168.1.16&lt;/v4-lan-public-prefix&gt;
-							   &lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
-							&lt;/t-provided-v4-lan-public-prefixes&gt;
-							&lt;t-provided-v6-lan-public-prefixes&gt;
-							   &lt;request-index&gt;1&lt;/request-index&gt;
-							   &lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
-							   &lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;
-							   &lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
-							&lt;/t-provided-v6-lan-public-prefixes&gt;
-							&lt;t-provided-v6-lan-public-prefixes&gt;
-							   &lt;request-index&gt;1&lt;/request-index&gt;
-							   &lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
-							   &lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;
-							   &lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
-							&lt;/t-provided-v6-lan-public-prefixes&gt;
-						&lt;/internet-service-change-details&gt;
-					&lt;/service-data&gt;
-				&lt;/layer3-service-list&gt;
-</RequestData>
-</SDNCAdapterCallbackRequest>
-</v1:SDNCAdapterCallback>
-</soapenv:Body>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"

+	xmlns:v1="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

+	<soapenv:Header />

+	<soapenv:Body>

+		<v1:SDNCAdapterCallback>

+<SDNCAdapterCallbackRequest xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

+    <CallbackHeader>

+        <RequestId>testRequestId</RequestId>

+        <ResponseCode>200</ResponseCode>

+        <ResponseMessage>OK</ResponseMessage>

+    </CallbackHeader>

+    <RequestData xsi:type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">				&lt;layer3-service-list xmlns="com:att:sdnctl:l3api"&gt;

+					&lt;service-instance-id&gt;FK/VLXM/003717//SW_INTERNET&lt;/service-instance-id&gt;

+					&lt;service-status&gt;

+						&lt;rpc-name&gt;service-configuration-operation&lt;/rpc-name&gt;

+						&lt;rpc-action&gt;activate&lt;/rpc-action&gt;

+						&lt;request-status&gt;synccomplete&lt;/request-status&gt;

+						&lt;final-indicator&gt;N&lt;/final-indicator&gt;

+						&lt;l3sdn-action&gt;Layer3ServiceActivateRequest&lt;/l3sdn-action&gt;

+						&lt;l3sdn-subaction&gt;SUPP&lt;/l3sdn-subaction&gt;

+						&lt;response-timestamp&gt;2015-04-28T21:32:11.386Z&lt;/response-timestamp&gt;

+					&lt;/service-status&gt;

+					&lt;service-data&gt;

+						&lt;internet-evc-access-information&gt;

+							&lt;ip-version&gt;ds&lt;/ip-version&gt;

+							&lt;internet-evc-speed-value&gt;8&lt;/internet-evc-speed-value&gt;

+							&lt;internet-evc-speed-units&gt;Mbps&lt;/internet-evc-speed-units&gt;

+						&lt;/internet-evc-access-information&gt;

+						&lt;vr-lan xmlns="com:att:sdnctl:l3api"&gt;

+							&lt;vr-lan-interface&gt;

+								&lt;static-routes&gt;

+									&lt;v6-static-routes&gt;

+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

+										&lt;v6-static-route-prefix&gt;2001:1890:12e3:2da::&lt;/v6-static-route-prefix&gt;

+										&lt;v6-static-route-prefix-length&gt;28&lt;/v6-static-route-prefix-length&gt;

+									&lt;/v6-static-routes&gt;

+									&lt;v4-static-routes&gt;

+										&lt;v4-static-route-prefix&gt;255.255.252.1&lt;/v4-static-route-prefix&gt;

+										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;

+										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;

+									&lt;/v4-static-routes&gt;

+									&lt;v6-static-routes&gt;

+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

+										&lt;v6-static-route-prefix&gt;2001:1890:12e3:2da::&lt;/v6-static-route-prefix&gt;

+										&lt;v6-static-route-prefix-length&gt;28&lt;/v6-static-route-prefix-length&gt;

+									&lt;/v6-static-routes&gt;

+									&lt;v4-static-routes&gt;

+										&lt;v4-static-route-prefix&gt;255.255.252.2&lt;/v4-static-route-prefix&gt;

+										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;

+										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;

+									&lt;/v4-static-routes&gt;

+									&lt;v4-static-routes&gt;

+										&lt;v4-static-route-prefix&gt;255.255.252.3&lt;/v4-static-route-prefix&gt;

+										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;

+										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;

+									&lt;/v4-static-routes&gt;

+								&lt;/static-routes&gt;

+								&lt;dhcp&gt;

+									&lt;v6-dhcp-server-enabled&gt;N&lt;/v6-dhcp-server-enabled&gt;

+									&lt;v4-dhcp-server-enabled&gt;Y&lt;/v4-dhcp-server-enabled&gt;

+									&lt;use-v6-default-pool&gt;N&lt;/use-v6-default-pool&gt;

+									&lt;excluded-v4-dhcp-addresses-from-default-pool&gt;

+									  &lt;excluded-v4-address&gt;192.168.1.7&lt;/excluded-v4-address&gt;

+									&lt;/excluded-v4-dhcp-addresses-from-default-pool&gt;

+									&lt;excluded-v4-dhcp-addresses-from-default-pool&gt;

+									  &lt;excluded-v4-address&gt;192.168.1.8&lt;/excluded-v4-address&gt;

+									&lt;/excluded-v4-dhcp-addresses-from-default-pool&gt;

+									&lt;v4-dhcp-pools&gt;

+										&lt;v4-dhcp-relay-next-hop-address&gt;1.1.1.1&lt;/v4-dhcp-relay-next-hop-address&gt;

+										&lt;v4-dhcp-pool-prefix-length&gt;28&lt;/v4-dhcp-pool-prefix-length&gt;

+										&lt;excluded-v4-addresses&gt;

+											&lt;excluded-v4-address&gt;192.168.1.5&lt;/excluded-v4-address&gt;

+										&lt;/excluded-v4-addresses&gt;

+										&lt;v4-dhcp-relay-gateway-address&gt;2.2.2.1&lt;/v4-dhcp-relay-gateway-address&gt;

+										&lt;excluded-v4-addresses&gt;

+											&lt;excluded-v4-address&gt;192.168.1.6&lt;/excluded-v4-address&gt;

+										&lt;/excluded-v4-addresses&gt;

+										&lt;v4-dhcp-pool-prefix&gt;192.155.2.3&lt;/v4-dhcp-pool-prefix&gt;

+									&lt;/v4-dhcp-pools&gt;

+									&lt;v4-dhcp-pools&gt;

+										&lt;v4-dhcp-relay-next-hop-address&gt;1.1.1.2&lt;/v4-dhcp-relay-next-hop-address&gt;

+										&lt;v4-dhcp-pool-prefix-length&gt;28&lt;/v4-dhcp-pool-prefix-length&gt;

+										&lt;excluded-v4-addresses&gt;

+											&lt;excluded-v4-address&gt;192.168.1.6&lt;/excluded-v4-address&gt;

+										&lt;/excluded-v4-addresses&gt;

+										&lt;v4-dhcp-relay-gateway-address&gt;2.2.2.2&lt;/v4-dhcp-relay-gateway-address&gt;

+										&lt;excluded-v4-addresses&gt;

+											&lt;excluded-v4-address&gt;192.168.1.7&lt;/excluded-v4-address&gt;

+										&lt;/excluded-v4-addresses&gt;

+										&lt;v4-dhcp-pool-prefix&gt;192.155.2.4&lt;/v4-dhcp-pool-prefix&gt;

+									&lt;/v4-dhcp-pools&gt;									

+									&lt;use-v4-default-pool&gt;Y&lt;/use-v4-default-pool&gt;

+									&lt;excluded-v6-dhcp-addresses-from-default-pool&gt;

+									  &lt;excluded-v6-address&gt;1:5&lt;/excluded-v6-address&gt;

+									&lt;/excluded-v6-dhcp-addresses-from-default-pool&gt;

+									&lt;excluded-v6-dhcp-addresses-from-default-pool&gt;

+									  &lt;excluded-v6-address&gt;1:6&lt;/excluded-v6-address&gt;

+									&lt;/excluded-v6-dhcp-addresses-from-default-pool&gt;

+									&lt;v6-dhcp-pools&gt;

+										&lt;v6-dhcp-relay-next-hop-address&gt;4:4&lt;/v6-dhcp-relay-next-hop-address&gt;

+										&lt;v6-dhcp-pool-prefix-length&gt;28&lt;/v6-dhcp-pool-prefix-length&gt;

+										&lt;excluded-v6-addresses&gt;

+											&lt;excluded-v6-address&gt;1:1&lt;/excluded-v6-address&gt;

+										&lt;/excluded-v6-addresses&gt;

+										&lt;v6-dhcp-relay-gateway-address&gt;3:3&lt;/v6-dhcp-relay-gateway-address&gt;

+										&lt;excluded-v6-addresses&gt;

+											&lt;excluded-v6-address&gt;2:2&lt;/excluded-v6-address&gt;

+										&lt;/excluded-v6-addresses&gt;

+										&lt;v6-dhcp-pool-prefix&gt;0:0&lt;/v6-dhcp-pool-prefix&gt;

+									&lt;/v6-dhcp-pools&gt;

+									&lt;v6-dhcp-pools&gt;

+										&lt;v6-dhcp-relay-next-hop-address&gt;4:4&lt;/v6-dhcp-relay-next-hop-address&gt;

+										&lt;v6-dhcp-pool-prefix-length&gt;28&lt;/v6-dhcp-pool-prefix-length&gt;

+										&lt;excluded-v6-addresses&gt;

+											&lt;excluded-v6-address&gt;1:1&lt;/excluded-v6-address&gt;

+										&lt;/excluded-v6-addresses&gt;

+										&lt;v6-dhcp-relay-gateway-address&gt;3:3&lt;/v6-dhcp-relay-gateway-address&gt;

+										&lt;excluded-v6-addresses&gt;

+											&lt;excluded-v6-address&gt;2:2&lt;/excluded-v6-address&gt;

+										&lt;/excluded-v6-addresses&gt;

+										&lt;v6-dhcp-pool-prefix&gt;0:0&lt;/v6-dhcp-pool-prefix&gt;

+									&lt;/v6-dhcp-pools&gt;									

+								&lt;/dhcp&gt;

+								&lt;firewall-lite&gt;

+									&lt;stateful-firewall-lite-v6-enabled&gt;N&lt;/stateful-firewall-lite-v6-enabled&gt;

+									&lt;stateful-firewall-lite-v4-enabled&gt;Y&lt;/stateful-firewall-lite-v4-enabled&gt;

+									&lt;v4-firewall-packet-filters&gt;

+									  &lt;v4-firewall-prefix&gt;0.0.0.1&lt;/v4-firewall-prefix&gt;

+									  &lt;v4-firewall-prefix-length&gt;1&lt;/v4-firewall-prefix-length&gt;

+									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;

+									  &lt;udp-ports&gt;

+									    &lt;port-number&gt;1&lt;/port-number&gt;

+									  &lt;/udp-ports&gt;

+									  &lt;tcp-ports&gt;

+									    &lt;port-number&gt;1&lt;/port-number&gt;

+									  &lt;/tcp-ports&gt;

+									&lt;/v4-firewall-packet-filters&gt;

+									&lt;v4-firewall-packet-filters&gt;

+									  &lt;v4-firewall-prefix&gt;0.0.0.2&lt;/v4-firewall-prefix&gt;

+									  &lt;v4-firewall-prefix-length&gt;2&lt;/v4-firewall-prefix-length&gt;

+									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;

+									  &lt;udp-ports&gt;

+									    &lt;port-number&gt;2&lt;/port-number&gt;

+									  &lt;/udp-ports&gt;

+									  &lt;tcp-ports&gt;

+									    &lt;port-number&gt;2&lt;/port-number&gt;

+									  &lt;/tcp-ports&gt;

+									&lt;/v4-firewall-packet-filters&gt;

+									&lt;v6-firewall-packet-filters&gt;

+									  &lt;v6-firewall-prefix&gt;:&lt;/v6-firewall-prefix&gt;

+									  &lt;v6-firewall-prefix-length&gt;0&lt;/v6-firewall-prefix-length&gt;

+									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;

+									  &lt;udp-ports&gt;

+									    &lt;port-number&gt;3&lt;/port-number&gt;

+									  &lt;/udp-ports&gt;

+									  &lt;tcp-ports&gt;

+									    &lt;port-number&gt;3&lt;/port-number&gt;

+									  &lt;/tcp-ports&gt;

+									&lt;/v6-firewall-packet-filters&gt;

+									&lt;v6-firewall-packet-filters&gt;

+									  &lt;v6-firewall-prefix&gt;:&lt;/v6-firewall-prefix&gt;

+									  &lt;v6-firewall-prefix-length&gt;1&lt;/v6-firewall-prefix-length&gt;

+									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;

+									  &lt;udp-ports&gt;

+									    &lt;port-number&gt;4&lt;/port-number&gt;

+									  &lt;/udp-ports&gt;

+									  &lt;tcp-ports&gt;

+									    &lt;port-number&gt;4&lt;/port-number&gt;

+									  &lt;/tcp-ports&gt;

+									&lt;/v6-firewall-packet-filters&gt;

+								&lt;/firewall-lite&gt;

+								&lt;pat&gt;

+									&lt;v4-pat-pools&gt;

+										&lt;v4-pat-pool-prefix&gt;192.168.1.44&lt;/v4-pat-pool-prefix&gt;

+										&lt;v4-pat-pool-next-hop-address&gt;192.168.1.5&lt;/v4-pat-pool-next-hop-address&gt;

+										&lt;v4-pat-pool-prefix-length&gt;0&lt;/v4-pat-pool-prefix-length&gt;

+									&lt;/v4-pat-pools&gt;

+									&lt;use-v4-default-pool&gt;Y&lt;/use-v4-default-pool&gt;

+									&lt;v4-pat-enabled&gt;N&lt;/v4-pat-enabled&gt;

+									&lt;v4-pat-pools&gt;

+										&lt;v4-pat-pool-prefix&gt;192.168.1.45&lt;/v4-pat-pool-prefix&gt;

+										&lt;v4-pat-pool-next-hop-address&gt;192.168.1.6&lt;/v4-pat-pool-next-hop-address&gt;

+										&lt;v4-pat-pool-prefix-length&gt;28&lt;/v4-pat-pool-prefix-length&gt;

+									&lt;/v4-pat-pools&gt;

+								&lt;/pat&gt;

+								&lt;nat&gt;

+								  &lt;v4-nat-enabled&gt;Y&lt;/v4-nat-enabled&gt;

+								  &lt;v4-nat-mapping-entries&gt;

+								    &lt;v4-nat-internal&gt;0.0.0.0&lt;/v4-nat-internal&gt;

+								    &lt;v4-nat-next-hop-address&gt;0.0.0.0&lt;/v4-nat-next-hop-address&gt;

+								    &lt;v4-nat-external&gt;0.0.0.0&lt;/v4-nat-external&gt;

+								  &lt;/v4-nat-mapping-entries&gt;

+								  &lt;v4-nat-mapping-entries&gt;

+								    &lt;v4-nat-internal&gt;0.0.0.1&lt;/v4-nat-internal&gt;

+								    &lt;v4-nat-next-hop-address&gt;0.0.0.1&lt;/v4-nat-next-hop-address&gt;

+								    &lt;v4-nat-external&gt;0.0.0.1&lt;/v4-nat-external&gt;

+								  &lt;/v4-nat-mapping-entries&gt;

+								&lt;/nat&gt;

+								&lt;vr-designation&gt;primary&lt;/vr-designation&gt;

+								&lt;v4-vce-loopback-address&gt;162.200.3.144&lt;/v4-vce-loopback-address&gt;

+								&lt;v6-vr-lan-prefix-length&gt;64&lt;/v6-vr-lan-prefix-length&gt;

+								&lt;v6-vce-wan-address&gt;2001:1890:12e3:2da::&lt;/v6-vce-wan-address&gt;

+								&lt;v6-vr-lan-prefix&gt;2620:0:10d0:f:ffff:ffff:ffff:fffe&lt;/v6-vr-lan-prefix&gt;

+								&lt;v4-vr-lan-prefix-length&gt;24&lt;/v4-vr-lan-prefix-length&gt;

+								&lt;v4-vr-lan-prefix&gt;10.192.27.254&lt;/v4-vr-lan-prefix&gt;

+								&lt;v4-public-lan-prefixes&gt;

+									&lt;t-provided-v4-lan-public-prefixes&gt;

+										&lt;request-index&gt;1&lt;/request-index&gt;

+										&lt;v4-next-hop-address&gt;192.168.1.2&lt;/v4-next-hop-address&gt;

+										&lt;v4-lan-public-prefix&gt;192.168.1.1&lt;/v4-lan-public-prefix&gt;

+										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

+									&lt;/t-provided-v4-lan-public-prefixes&gt;

+									&lt;t-provided-v4-lan-public-prefixes&gt;

+										&lt;request-index&gt;1&lt;/request-index&gt;

+										&lt;v4-next-hop-address&gt;192.168.1.72&lt;/v4-next-hop-address&gt;

+										&lt;v4-lan-public-prefix&gt;192.168.1.71&lt;/v4-lan-public-prefix&gt;

+										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

+									&lt;/t-provided-v4-lan-public-prefixes&gt;

+									&lt;t-provided-v4-lan-public-prefixes&gt;

+										&lt;request-index&gt;1&lt;/request-index&gt;

+										&lt;v4-next-hop-address&gt;192.168.1.68&lt;/v4-next-hop-address&gt;

+										&lt;v4-lan-public-prefix&gt;192.168.1.67&lt;/v4-lan-public-prefix&gt;

+										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

+									&lt;/t-provided-v4-lan-public-prefixes&gt;

+								&lt;/v4-public-lan-prefixes&gt;

+								&lt;v6-public-lan-prefixes&gt;

+									&lt;t-provided-v6-lan-public-prefixes&gt;

+										&lt;request-index&gt;1&lt;/request-index&gt;

+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

+										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;

+										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

+									&lt;/t-provided-v6-lan-public-prefixes&gt;

+									&lt;t-provided-v6-lan-public-prefixes&gt;

+										&lt;request-index&gt;1&lt;/request-index&gt;

+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

+										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:3da::&lt;/v6-lan-public-prefix&gt;

+										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

+									&lt;/t-provided-v6-lan-public-prefixes&gt;

+									&lt;t-provided-v6-lan-public-prefixes&gt;

+										&lt;request-index&gt;1&lt;/request-index&gt;

+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

+										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:4da::&lt;/v6-lan-public-prefix&gt;

+										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

+									&lt;/t-provided-v6-lan-public-prefixes&gt;

+								&lt;/v6-public-lan-prefixes&gt;

+							&lt;/vr-lan-interface&gt;

+							&lt;routing-protocol&gt;none&lt;/routing-protocol&gt;

+						&lt;/vr-lan&gt;

+&lt;ucpe-vms-service-information&gt;				

+ &lt;transport-service-information&gt;

+    &lt;transport-service-type&gt;AVPN&lt;/transport-service-type&gt;

+	&lt;access-circuit-info&gt;

+	   &lt;access-circuit-id&gt;1&lt;/access-circuit-id&gt;

+	   &lt;dual-mode&gt;Active&lt;/dual-mode&gt;

+	&lt;/access-circuit-info&gt;

+	&lt;access-circuit-info&gt;

+	   &lt;access-circuit-id&gt;2&lt;/access-circuit-id&gt;

+	   &lt;dual-mode&gt;Standby&lt;/dual-mode&gt;

+	&lt;/access-circuit-info&gt;	

+ &lt;/transport-service-information&gt;

+ &lt;ucpe-information&gt;

+    &lt;ucpe-host-name&gt;hostname&lt;/ucpe-host-name&gt;

+    &lt;ucpe-activation-code&gt;activecode&lt;/ucpe-activation-code&gt;

+    &lt;out-of-band-management-modem&gt;OOB&lt;/out-of-band-management-modem&gt;

+  &lt;/ucpe-information&gt;

+  &lt;vnf-list&gt;

+	&lt;vnf-information&gt; 

+		&lt;vnf-instance-id&gt;1&lt;/vnf-instance-id&gt; 

+		&lt;vnf-sequence-number&gt;1&lt;/vnf-sequence-number&gt;

+		&lt;vnf-type&gt;ZZ&lt;/vnf-type&gt;

+		&lt;vnf-vendor&gt;JUNIPER&lt;/vnf-vendor&gt;

+		&lt;vnf-model&gt;MODEL1&lt;/vnf-model&gt;

+		&lt;vnf-id&gt;1&lt;/vnf-id&gt;

+		&lt;prov-status&gt;1&lt;/prov-status&gt;

+		&lt;operational-state&gt;1&lt;/operational-state&gt;

+		&lt;orchestration-status&gt;1&lt;/orchestration-status&gt;

+		&lt;equipment-role&gt;1&lt;/equipment-role&gt;

+    &lt;/vnf-information&gt;

+	&lt;vnf-information&gt; 

+		&lt;vnf-instance-id&gt;2&lt;/vnf-instance-id&gt; 

+		&lt;vnf-sequence-number&gt;2&lt;/vnf-sequence-number&gt;

+		&lt;vnf-type&gt;HY&lt;/vnf-type&gt;

+		&lt;vnf-vendor&gt;JUNIPER&lt;/vnf-vendor&gt;

+		&lt;vnf-model&gt;MODEL2&lt;/vnf-model&gt;

+		&lt;vnf-id&gt;2&lt;/vnf-id&gt;

+		&lt;prov-status&gt;2&lt;/prov-status&gt;

+		&lt;operational-state&gt;2&lt;/operational-state&gt;

+		&lt;orchestration-status&gt;2&lt;/orchestration-status&gt;

+		&lt;equipment-role&gt;2&lt;/equipment-role&gt;

+    &lt;/vnf-information&gt;					

+  &lt;/vnf-list&gt;

+ &lt;/ucpe-vms-service-information&gt;										

+						&lt;request-information&gt;

+							&lt;request-action&gt;Layer3ServiceActivateRequest&lt;/request-action&gt;

+							&lt;order-number&gt;4281555&lt;/order-number&gt;

+							&lt;request-id&gt;155415ab-b4a7-4382-b4c6-d17d9sm42855&lt;/request-id&gt;

+							&lt;notification-url&gt;https://csi-tst-q22.it.com:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws&lt;/notification-url&gt;

+							&lt;source&gt;OMX&lt;/source&gt;

+							&lt;order-version&gt;1&lt;/order-version&gt;

+						&lt;/request-information&gt;

+						&lt;sdnc-request-header&gt;

+							&lt;svc-action&gt;activate&lt;/svc-action&gt;

+							&lt;svc-notification-url&gt;https://msojra.mtsnjdcp1.aic.cip.com:8443/adapters/rest/SDNCNotify&lt;/svc-notification-url&gt;

+							&lt;svc-request-id&gt;5b1f3c5d-cdf9-488d-8a4b-d3f1229d7760&lt;/svc-request-id&gt;

+						&lt;/sdnc-request-header&gt;

+						&lt;l2-homing-information&gt;

+							&lt;topology&gt;MultiPoint&lt;/topology&gt;

+							&lt;preferred-aic-clli&gt;MTSNJA4LCP1&lt;/preferred-aic-clli&gt;

+							&lt;evc-name&gt;AS/VLXM/003717//SW&lt;/evc-name&gt;

+						&lt;/l2-homing-information&gt;

+						&lt;service-information&gt;

+							&lt;service-instance-id&gt;FK/VLXM/003717//SW_INTERNET&lt;/service-instance-id&gt;

+							&lt;subscriber-name&gt;ST E2E Test42855_1300004281555&lt;/subscriber-name&gt;

+							&lt;service-type&gt;SDN-ETHERNET-INTERNET&lt;/service-type&gt;

+						&lt;/service-information&gt;

+						&lt;internet-service-change-details&gt;

+							&lt;internet-evc-speed-value&gt;10&lt;/internet-evc-speed-value&gt;

+							&lt;internet-evc-speed-units&gt;Kbps&lt;/internet-evc-speed-units&gt;

+							&lt;t-provided-v4-lan-public-prefixes&gt;

+							   &lt;request-index&gt;1&lt;/request-index&gt;

+							   &lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;

+							   &lt;v4-lan-public-prefix&gt;192.168.1.15&lt;/v4-lan-public-prefix&gt;

+							   &lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

+							&lt;/t-provided-v4-lan-public-prefixes&gt;

+							&lt;t-provided-v4-lan-public-prefixes&gt;

+							   &lt;request-index&gt;2&lt;/request-index&gt;

+							   &lt;v4-next-hop-address&gt;192.168.1.16&lt;/v4-next-hop-address&gt;

+							   &lt;v4-lan-public-prefix&gt;192.168.1.16&lt;/v4-lan-public-prefix&gt;

+							   &lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

+							&lt;/t-provided-v4-lan-public-prefixes&gt;

+							&lt;t-provided-v6-lan-public-prefixes&gt;

+							   &lt;request-index&gt;1&lt;/request-index&gt;

+							   &lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

+							   &lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;

+							   &lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

+							&lt;/t-provided-v6-lan-public-prefixes&gt;

+							&lt;t-provided-v6-lan-public-prefixes&gt;

+							   &lt;request-index&gt;1&lt;/request-index&gt;

+							   &lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

+							   &lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;

+							   &lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

+							&lt;/t-provided-v6-lan-public-prefixes&gt;

+						&lt;/internet-service-change-details&gt;

+					&lt;/service-data&gt;

+				&lt;/layer3-service-list&gt;

+</RequestData>

+</SDNCAdapterCallbackRequest>

+</v1:SDNCAdapterCallback>

+</soapenv:Body>

 </soapenv:Envelope>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryInstance_Success.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryInstance_Success.xml
index a7ac309..09f01fb 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryInstance_Success.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryInstance_Success.xml
@@ -1,4 +1,4 @@
-<result-data>
-  <resource-type>service-instance</resource-type>
-  <resource-link>https://aai-conexus-e2e.test.att.com:8443/aai/v8/business/customers/customer/8310000058863/service-subscriptions/service-subscription/vMOG/service-instances/service-instance/f70e927b-6087-4974-9ef8-c5e4d5847ca4</resource-link>
+<result-data>

+  <resource-type>service-instance</resource-type>

+  <resource-link>https://aai-conexus-e2e.test.com:8443/aai/v8/business/customers/customer/8310000058863/service-subscriptions/service-subscription/vMOG/service-instances/service-instance/f70e927b-6087-4974-9ef8-c5e4d5847ca4</resource-link>

 </result-data>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_NoPayload_Success.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_NoPayload_Success.xml
index d8d10db..1965586 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_NoPayload_Success.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_NoPayload_Success.xml
@@ -1,73 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<l3-network xmlns="http://com.att.aai.inventory/v8">
-         <network-id>49c86598-f766-46f8-84f8-8d1c1b10f9b4</network-id>
-         <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>
-         <network-type>CONTRAIL_EXTERNAL</network-type>
-         <network-role>dmz_direct</network-role>
-         <network-technology>contrail</network-technology>
-         <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
-         <network-role-instance>0</network-role-instance>
-         <orchestration-status>pending-create</orchestration-status>
-   		 <physical-network-name>networkName</physical-network-name>
-   		 <is-provider-network>false</is-provider-network>
-   		 <is-shared-network>true</is-shared-network>
-   	 	 <is-external-network>false</is-external-network>         
-         <subnets>
-            <subnet>
-               <subnet-id>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnet-id>
-               <gateway-address>107.239.52.1</gateway-address>
-               <network-start-address>107.239.52.0</network-start-address>
-               <cidr-mask>24</cidr-mask>
-               <ip-version>4</ip-version>
-               <orchestration-status>pending-create</orchestration-status>
-               <dhcp-enabled>true</dhcp-enabled>
-   	  		   <subnet-name>subnetName</subnet-name>
-               <relationship-list/>
-            </subnet>
-         </subnets>
-	  	 <segmentation-assignments>
-	  		<segmentation-id>413</segmentation-id>
-	  		<resource-version>4132176</resource-version>
-	  	 </segmentation-assignments>         
-         <relationship-list>
-            <relationship>
-               <related-to>vpn-binding</related-to>
-               <related-link>https://aai-app-e2e.test.att.com:8443/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/</related-link>
-               <relationship-data>
-                  <relationship-key>vpn-binding.vpn-id</relationship-key>
-                  <relationship-value>85f015d0-2e32-4c30-96d2-87a1a27f8017</relationship-value>
-               </relationship-data>
-            </relationship>
-            <relationship>
-               <related-to>vpn-binding</related-to>
-               <related-link>https://aai-app-e2e.test.att.com:8443/aai/v8/network/vpn-bindings/vpn-binding/c980a6ef-3b88-49f0-9751-dbad8608d0a6/</related-link>
-               <relationship-data>
-                  <relationship-key>vpn-binding.vpn-id</relationship-key>
-                  <relationship-value>c980a6ef-3b88-49f0-9751-dbad8608d0a6</relationship-value>
-               </relationship-data>
-            </relationship>
-            <relationship>
-               <related-to>tenant</related-to>
-               <related-link>https://aai-app-e2e.test.att.com:8443/aai/v8/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>
-               <relationship-data>
-                  <relationship-key>tenant.tenant-id</relationship-key>
-                  <relationship-value>7dd5365547234ee8937416c65507d266</relationship-value>
-               </relationship-data>
-            </relationship>
-            <relationship>
-				<related-to>network-policy</related-to>
-				<related-link>https://aai-app-e2e.test.att.com:8443/aai/v8/network/network-policies/network-policy/cee6d136-e378-4678-a024-2cd15f0ee0cg</related-link>
-				<relationship-data>
-					<relationship-key>network-policy.network-policy-id</relationship-key>
-					<relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0cg</relationship-value>
-				</relationship-data>
-			</relationship>
-			<relationship>
-			   <related-to>route-table-reference</related-to>
-			   <relationship-data>
-				  <relationship-key>route-table-reference.route-table-reference-id</relationship-key>
-				  <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0hi</relationship-value>
-			   </relationship-data>
-			</relationship>			
-         </relationship-list>
-</l3-network>
+<?xml version="1.0" encoding="UTF-8"?>

+<l3-network xmlns="http://com.aai.inventory/v8">

+         <network-id>49c86598-f766-46f8-84f8-8d1c1b10f9b4</network-id>

+         <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>

+         <network-type>CONTRAIL_EXTERNAL</network-type>

+         <network-role>dmz_direct</network-role>

+         <network-technology>contrail</network-technology>

+         <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

+         <network-role-instance>0</network-role-instance>

+         <orchestration-status>pending-create</orchestration-status>

+   		 <physical-network-name>networkName</physical-network-name>

+   		 <is-provider-network>false</is-provider-network>

+   		 <is-shared-network>true</is-shared-network>

+   	 	 <is-external-network>false</is-external-network>         

+         <subnets>

+            <subnet>

+               <subnet-id>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnet-id>

+               <gateway-address>107.239.52.1</gateway-address>

+               <network-start-address>107.239.52.0</network-start-address>

+               <cidr-mask>24</cidr-mask>

+               <ip-version>4</ip-version>

+               <orchestration-status>pending-create</orchestration-status>

+               <dhcp-enabled>true</dhcp-enabled>

+   	  		   <subnet-name>subnetName</subnet-name>

+               <relationship-list/>

+            </subnet>

+         </subnets>

+	  	 <segmentation-assignments>

+	  		<segmentation-id>413</segmentation-id>

+	  		<resource-version>4132176</resource-version>

+	  	 </segmentation-assignments>         

+         <relationship-list>

+            <relationship>

+               <related-to>vpn-binding</related-to>

+               <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/</related-link>

+               <relationship-data>

+                  <relationship-key>vpn-binding.vpn-id</relationship-key>

+                  <relationship-value>85f015d0-2e32-4c30-96d2-87a1a27f8017</relationship-value>

+               </relationship-data>

+            </relationship>

+            <relationship>

+               <related-to>vpn-binding</related-to>

+               <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/c980a6ef-3b88-49f0-9751-dbad8608d0a6/</related-link>

+               <relationship-data>

+                  <relationship-key>vpn-binding.vpn-id</relationship-key>

+                  <relationship-value>c980a6ef-3b88-49f0-9751-dbad8608d0a6</relationship-value>

+               </relationship-data>

+            </relationship>

+            <relationship>

+               <related-to>tenant</related-to>

+               <related-link>https://aai-app-e2e.test.com:8443/aai/v8/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>

+               <relationship-data>

+                  <relationship-key>tenant.tenant-id</relationship-key>

+                  <relationship-value>7dd5365547234ee8937416c65507d266</relationship-value>

+               </relationship-data>

+            </relationship>

+            <relationship>

+				<related-to>network-policy</related-to>

+				<related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/network-policies/network-policy/cee6d136-e378-4678-a024-2cd15f0ee0cg</related-link>

+				<relationship-data>

+					<relationship-key>network-policy.network-policy-id</relationship-key>

+					<relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0cg</relationship-value>

+				</relationship-data>

+			</relationship>

+			<relationship>

+			   <related-to>route-table-reference</related-to>

+			   <relationship-data>

+				  <relationship-key>route-table-reference.route-table-reference-id</relationship-key>

+				  <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0hi</relationship-value>

+			   </relationship-data>

+			</relationship>			

+         </relationship-list>

+</l3-network>

diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef1_AAIResponse_Success.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef1_AAIResponse_Success.xml
index 292b5e8..48f652c 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef1_AAIResponse_Success.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef1_AAIResponse_Success.xml
@@ -1,20 +1,20 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
-                   statusCode="200">
-   <rest:headers>
-      <rest:header name="Transfer-Encoding" value="chunked"/>
-      <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>
-      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
-      <rest:header name="X-AAI-TXID"
-                   value="mtcnjv9aaas01.mtcnj.aic.cip.att.com-20160314-20:53:33:487-134392"/>
-      <rest:header name="Content-Type" value="application/xml"/>
-      <rest:header name="Server" value="Apache-Coyote/1.1"/>
-      <rest:header name="Cache-Control" value="private"/>
-   </rest:headers>
-   <rest:payload contentType="text/xml">
-      <route-table-references xmlns="http://com.att.aai.inventory/v8">
-         <route-table-reference-id>5938baec-03ca-2bd5-a3f1-d54x123e253a</route-table-reference-id>
-         <route-table-reference-fqdn>refFQDN1</route-table-reference-fqdn>
-         <resource-version>12345</resource-version>
-      </route-table-references>
-   </rest:payload>
+<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

+                   statusCode="200">

+   <rest:headers>

+      <rest:header name="Transfer-Encoding" value="chunked"/>

+      <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>

+      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>

+      <rest:header name="X-AAI-TXID"

+                   value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160314-20:53:33:487-134392"/>

+      <rest:header name="Content-Type" value="application/xml"/>

+      <rest:header name="Server" value="Apache-Coyote/1.1"/>

+      <rest:header name="Cache-Control" value="private"/>

+   </rest:headers>

+   <rest:payload contentType="text/xml">

+      <route-table-references xmlns="http://com.aai.inventory/v8">

+         <route-table-reference-id>5938baec-03ca-2bd5-a3f1-d54x123e253a</route-table-reference-id>

+         <route-table-reference-fqdn>refFQDN1</route-table-reference-fqdn>

+         <resource-version>12345</resource-version>

+      </route-table-references>

+   </rest:payload>

 </rest:RESTResponse>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef2_AAIResponse_Success.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef2_AAIResponse_Success.xml
index 910f701..c911d32 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef2_AAIResponse_Success.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef2_AAIResponse_Success.xml
@@ -1,20 +1,20 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
-                   statusCode="200">
-   <rest:headers>
-      <rest:header name="Transfer-Encoding" value="chunked"/>
-      <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>
-      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
-      <rest:header name="X-AAI-TXID"
-                   value="mtcnjv9aaas01.mtcnj.aic.cip.att.com-20160314-20:53:33:487-134392"/>
-      <rest:header name="Content-Type" value="application/xml"/>
-      <rest:header name="Server" value="Apache-Coyote/1.1"/>
-      <rest:header name="Cache-Control" value="private"/>
-   </rest:headers>
-   <rest:payload contentType="text/xml">
-      <route-table-references xmlns="http://com.att.aai.inventory/v8">
-         <route-table-reference-id>5938baec-03ca-2bd5-a3f1-d54x123e253a</route-table-reference-id>
-         <route-table-reference-fqdn>refFQDN2</route-table-reference-fqdn>
-         <resource-version>12345</resource-version>
-      </route-table-references>
-   </rest:payload>
+<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

+                   statusCode="200">

+   <rest:headers>

+      <rest:header name="Transfer-Encoding" value="chunked"/>

+      <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>

+      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>

+      <rest:header name="X-AAI-TXID"

+                   value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160314-20:53:33:487-134392"/>

+      <rest:header name="Content-Type" value="application/xml"/>

+      <rest:header name="Server" value="Apache-Coyote/1.1"/>

+      <rest:header name="Cache-Control" value="private"/>

+   </rest:headers>

+   <rest:payload contentType="text/xml">

+      <route-table-references xmlns="http://com.aai.inventory/v8">

+         <route-table-reference-id>5938baec-03ca-2bd5-a3f1-d54x123e253a</route-table-reference-id>

+         <route-table-reference-fqdn>refFQDN2</route-table-reference-fqdn>

+         <resource-version>12345</resource-version>

+      </route-table-references>

+   </rest:payload>

 </rest:RESTResponse>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/AddNetworkPolicy_AAIResponse_Success.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/AddNetworkPolicy_AAIResponse_Success.xml
index d968bcc..d3f9c1e 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/AddNetworkPolicy_AAIResponse_Success.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/AddNetworkPolicy_AAIResponse_Success.xml
@@ -1,21 +1,21 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
-                   statusCode="200">
-   <rest:headers>
-      <rest:header name="Transfer-Encoding" value="chunked"/>
-      <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>
-      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
-      <rest:header name="X-AAI-TXID"
-                   value="mtcnjv9aaas01.mtcnj.aic.cip.att.com-20160314-20:53:33:487-134392"/>
-      <rest:header name="Content-Type" value="application/xml"/>
-      <rest:header name="Server" value="Apache-Coyote/1.1"/>
-      <rest:header name="Cache-Control" value="private"/>
-   </rest:headers>
-   <rest:payload contentType="text/xml">
-      <network-policy xmlns="http://com.att.aai.inventory/v8">
-         <network-policy-id>9a7b327d9-287aa00-82c4b0-105757</network-policy-id>
-         <network-policy-fqdn>fqdn123</network-policy-fqdn>
-         <heat-stack-id>slowburn</heat-stack-id>
-         <resource-version>145878989</resource-version>
-      </network-policy>
-   </rest:payload>
+<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

+                   statusCode="200">

+   <rest:headers>

+      <rest:header name="Transfer-Encoding" value="chunked"/>

+      <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>

+      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>

+      <rest:header name="X-AAI-TXID"

+                   value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160314-20:53:33:487-134392"/>

+      <rest:header name="Content-Type" value="application/xml"/>

+      <rest:header name="Server" value="Apache-Coyote/1.1"/>

+      <rest:header name="Cache-Control" value="private"/>

+   </rest:headers>

+   <rest:payload contentType="text/xml">

+      <network-policy xmlns="http://com.aai.inventory/v8">

+         <network-policy-id>9a7b327d9-287aa00-82c4b0-105757</network-policy-id>

+         <network-policy-fqdn>fqdn123</network-policy-fqdn>

+         <heat-stack-id>slowburn</heat-stack-id>

+         <resource-version>145878989</resource-version>

+      </network-policy>

+   </rest:payload>

 </rest:RESTResponse>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/GenericVnf.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/GenericVnf.xml
index 60f3d01..c159e2e 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/GenericVnf.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/GenericVnf.xml
@@ -1,38 +1,38 @@
-<generic-vnf xmlns="http://com.att.aai.inventory/v7">
-	<vnf-id>skask</vnf-id>
-	<vnf-name>STMTN5MMSC20</vnf-name>
-	<vnf-type>pcrf-capacity</vnf-type>
-	<service-id>SDN-MOBILITY</service-id>
-	<equipment-role>vPCRF</equipment-role>
-	<orchestration-status>pending-create</orchestration-status>
-	<in-maint>false</in-maint>
-	<is-closed-loop-disabled>false</is-closed-loop-disabled>
-	<persona-model-id>introvert</persona-model-id>
-	<persona-model-version>2.0</persona-model-version>
-	<resource-version>0000020</resource-version>
-	<vf-modules>
-		<vf-module>
-			<vf-module-id>lukewarm</vf-module-id>
-			<vf-module-name>PCRF::module-0-0</vf-module-name>
-			<persona-model-id>introvert</persona-model-id>
-			<persona-model-version>2.0</persona-model-version>
-			<is-base-vf-module>true</is-base-vf-module>
-			<heat-stack-id>fastburn</heat-stack-id>
-			<orchestration-status>pending-create</orchestration-status>
-			<resource-version>0000074</resource-version>
-		</vf-module>
-		<vf-module>
-			<vf-module-id>supercool</vf-module-id>
-			<vf-module-name>PCRF::module-1-0</vf-module-name>
-			<persona-model-id>extrovert</persona-model-id>
-			<persona-model-version>2.0</persona-model-version>
-			<is-base-vf-module>false</is-base-vf-module>
-			<heat-stack-id>slowburn</heat-stack-id>
-			<orchestration-status>pending-create</orchestration-status>
-			<resource-version>0000075</resource-version>
-		</vf-module>
-	</vf-modules>
-	<relationship-list/>
-	<l-interfaces/>
-	<lag-interfaces/>
-</generic-vnf>
+<generic-vnf xmlns="http://com.aai.inventory/v7">

+	<vnf-id>skask</vnf-id>

+	<vnf-name>STMTN5MMSC20</vnf-name>

+	<vnf-type>pcrf-capacity</vnf-type>

+	<service-id>SDN-MOBILITY</service-id>

+	<equipment-role>vPCRF</equipment-role>

+	<orchestration-status>pending-create</orchestration-status>

+	<in-maint>false</in-maint>

+	<is-closed-loop-disabled>false</is-closed-loop-disabled>

+	<persona-model-id>introvert</persona-model-id>

+	<persona-model-version>2.0</persona-model-version>

+	<resource-version>0000020</resource-version>

+	<vf-modules>

+		<vf-module>

+			<vf-module-id>lukewarm</vf-module-id>

+			<vf-module-name>PCRF::module-0-0</vf-module-name>

+			<persona-model-id>introvert</persona-model-id>

+			<persona-model-version>2.0</persona-model-version>

+			<is-base-vf-module>true</is-base-vf-module>

+			<heat-stack-id>fastburn</heat-stack-id>

+			<orchestration-status>pending-create</orchestration-status>

+			<resource-version>0000074</resource-version>

+		</vf-module>

+		<vf-module>

+			<vf-module-id>supercool</vf-module-id>

+			<vf-module-name>PCRF::module-1-0</vf-module-name>

+			<persona-model-id>extrovert</persona-model-id>

+			<persona-model-version>2.0</persona-model-version>

+			<is-base-vf-module>false</is-base-vf-module>

+			<heat-stack-id>slowburn</heat-stack-id>

+			<orchestration-status>pending-create</orchestration-status>

+			<resource-version>0000075</resource-version>

+		</vf-module>

+	</vf-modules>

+	<relationship-list/>

+	<l-interfaces/>

+	<lag-interfaces/>

+</generic-vnf>

diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/QueryNetworkPolicy_AAIResponse_Success.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/QueryNetworkPolicy_AAIResponse_Success.xml
index 0442afc..94e0042 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/QueryNetworkPolicy_AAIResponse_Success.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/QueryNetworkPolicy_AAIResponse_Success.xml
@@ -1,21 +1,21 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
-                   statusCode="200">
-   <rest:headers>
-      <rest:header name="Transfer-Encoding" value="chunked"/>
-      <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>
-      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
-      <rest:header name="X-AAI-TXID"
-                   value="mtcnjv9aaas01.mtcnj.aic.cip.att.com-20160314-20:53:33:487-134392"/>
-      <rest:header name="Content-Type" value="application/xml"/>
-      <rest:header name="Server" value="Apache-Coyote/1.1"/>
-      <rest:header name="Cache-Control" value="private"/>
-   </rest:headers>
-   <rest:payload contentType="text/xml">
-      <network-policy xmlns="http://com.att.aai.inventory/v8">
-         <network-policy-id>9a7b327d9-287aa00-82c4b0-105757</network-policy-id>
-         <network-policy-fqdn>GN_EVPN_Test</network-policy-fqdn>
-         <heat-stack-id>195159195</heat-stack-id>
-         <resource-version>14567890</resource-version>
-      </network-policy>
-   </rest:payload>
+<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

+                   statusCode="200">

+   <rest:headers>

+      <rest:header name="Transfer-Encoding" value="chunked"/>

+      <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>

+      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>

+      <rest:header name="X-AAI-TXID"

+                   value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160314-20:53:33:487-134392"/>

+      <rest:header name="Content-Type" value="application/xml"/>

+      <rest:header name="Server" value="Apache-Coyote/1.1"/>

+      <rest:header name="Cache-Control" value="private"/>

+   </rest:headers>

+   <rest:payload contentType="text/xml">

+      <network-policy xmlns="http://com.aai.inventory/v8">

+         <network-policy-id>9a7b327d9-287aa00-82c4b0-105757</network-policy-id>

+         <network-policy-fqdn>GN_EVPN_Test</network-policy-fqdn>

+         <heat-stack-id>195159195</heat-stack-id>

+         <resource-version>14567890</resource-version>

+      </network-policy>

+   </rest:payload>

 </rest:RESTResponse>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallback.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallback.xml
index b143e3b..7c67095 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallback.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallback.xml
@@ -1,315 +1,315 @@
-<output xmlns="com:att:sdnctl:vnf">
-<vnf-list xmlns="com:att:sdnctl:vnf">
-	<vnf-id>bd1b3789-6474-4935-94b2-90b656e035d0</vnf-id>
-	<service-data>
-		<vnf-id>bd1b3789-6474-4935-94b2-90b656e035d0</vnf-id>
-		<sdnc-request-header>
-			<svc-request-id>9ddf628a-9eca-430e-8974-22d520a31be1</svc-request-id>
-			<svc-action>assign</svc-action>
-			<svc-notification-url>https://msojra.infra.aic.att.net:8443/adapters/rest/SDNCNotify</svc-notification-url>
-		</sdnc-request-header>
-		<service-information>
-			<subscriber-name>notsurewecare</subscriber-name>
-			<service-instance-id>bd1b3789-6474-4935-94b2-90b656e035d0</service-instance-id>
-			<service-type>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-type>
-			<service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
-		</service-information>
-		<oper-status>
-			<order-status>PendingCreate</order-status>
-		</oper-status>
-		<vnf-request-information>
-			<aic-cloud-region>VNN1CA52LCP</aic-cloud-region>
-			<vnf-name>ZVNNMOGX01_base</vnf-name>
-			<generic-vnf-id>afd0f02a-1ddb-43bb-aded-5113e46e82ae</generic-vnf-id>
-			<generic-vnf-type>ZVNN1MOGX01-SVC/ZVNN1MOGX01 - VF AUG 1 1</generic-vnf-type>
-			<generic-vnf-name>ZVNN1MOGX01</generic-vnf-name>
-			<tenant>33d209df14ac4c08ad60747185d2f3e0</tenant>
-			<vnf-id>bd1b3789-6474-4935-94b2-90b656e035d0</vnf-id>
-			<vnf-type>ZVNN1MOGX01 - VF AUG 1::module-0</vnf-type>
-		</vnf-request-information>
-		<vnf-topology-information>
-			<vnf-assignments>
-				<vnf-networks>
-					<network-role>mog_exn</network-role>
-					<network-id>03dbd833-785c-40c0-bf32-37594b5334bc</network-id>
-					<network-name>MNS-25180-P-VNNYCA01_exn_protected_net_1</network-name>
-					<contrail-network-fqdn/>
-					<subnet-id/>
-					<neutron-id>6f82d234-41a4-48e9-a9e8-415667a72929</neutron-id>
-					<sriov-vlan-filter-list>
-						<sriov-vlan-filter>filter1</sriov-vlan-filter>
-					</sriov-vlan-filter-list>
-					<sriov-vlan-filter-list>
-						<sriov-vlan-filter>filter2</sriov-vlan-filter>                         
-                     </sriov-vlan-filter-list>
-				</vnf-networks>
-				<vnf-networks>
-					<network-role>mog_oam</network-role>
-					<network-id>3f181cde-9380-4c20-9d3a-e1a4ee74f994</network-id>
-					<network-name>MNS-25180-P-VNNYCA01_oam_protected_net_1</network-name>
-					<contrail-network-fqdn/>
-					<subnet-id/>
-					<neutron-id>713b6770-13fa-4949-8dbb-a1288c5e5932</neutron-id>
-				</vnf-networks>
-				<vnf-networks>
-					<network-role>mog_cor_B</network-role>
-					<network-id>821a550a-3f50-4725-995b-f212d5caec7c</network-id>
-					<network-name>MNS-25180-P-VNNYCA01_cor_direct_net_1</network-name>
-					<contrail-network-fqdn/>
-					<subnet-id/>
-					<neutron-id>18926e56-12b6-4a4d-98b6-37e0c05626ee</neutron-id>
-				</vnf-networks>
-				<vnf-networks>
-					<network-role>mog_cor_A</network-role>
-					<network-id>3dabf5c0-cffb-420c-8960-8499c74eb25f</network-id>
-					<network-name>MNS-25180-P-VNNYCA01_cor_direct_net_2</network-name>
-					<contrail-network-fqdn/>
-					<subnet-id/>
-					<neutron-id>35530b29-a4de-48ff-a014-111110ccc652</neutron-id>
-				</vnf-networks>
-				<vnf-networks>
-					<network-role>mog_gn</network-role>
-					<network-id>3ce97321-6e7f-49af-bd12-f833e377c310</network-id>
-					<network-name>MNS-25180-P-VNNYCA01_gn_direct_net_1</network-name>
-					<contrail-network-fqdn/>
-					<subnet-id/>
-					<neutron-id>32bfdd2c-28e1-4895-87a6-373bf12c3129</neutron-id>
-				</vnf-networks>
-				<vnf-networks>
-					<network-role>mog_dmz</network-role>
-					<network-id>d43ca910-02a5-47dc-8510-100a68a3c9e0</network-id>
-					<network-name>MNS-25180-P-VNNYCA01_dmz_protected_net_1</network-name>
-					<contrail-network-fqdn/>
-					<subnet-id/>
-					<neutron-id>cb9500fb-943f-412e-aea6-458711564a75</neutron-id>
-				</vnf-networks>
-				<availability-zones>
-					<availability-zone>nova</availability-zone>
-				</availability-zones>
-				<vnf-vms>
-					<vm-type>ps</vm-type>
-					<vm-names>
-						<vm-name>ZVNN1MOGX01MPS001</vm-name>
-					</vm-names>
-					<vm-names>
-						<vm-name>ZVNN1MOGX01MPS002</vm-name>
-					</vm-names>
-					<vm-names>
-						<vm-name>ZVNN1MOGX01MPS003</vm-name>
-					</vm-names>
-					<vm-names>
-						<vm-name>ZVNN1MOGX01MPS004</vm-name>
-					</vm-names>
-					<vm-count>4</vm-count>
-					<vm-networks>
-						<network-role>mog_cor_B</network-role>
-						<network-ips>
-							<ip-address>107.224.36.251</ip-address>
-						</network-ips>
-						<network-ips>
-							<ip-address>107.224.36.252</ip-address>
-						</network-ips>
-						<network-ips>
-							<ip-address>107.224.36.253</ip-address>
-						</network-ips>
-						<network-ips>
-							<ip-address>107.224.36.254</ip-address>
-						</network-ips>
-						<use-dhcp>N</use-dhcp>
-					</vm-networks>
-				</vnf-vms>
-				<vnf-vms>
-					<vm-type>cm</vm-type>
-					<vm-names>
-						<vm-name>ZVNN1MOGX01MCM001</vm-name>
-					</vm-names>
-					<vm-names>
-						<vm-name>ZVNN1MOGX01OAM002</vm-name>
-					</vm-names>
-					<vm-count>1</vm-count>
-					<vm-networks>
-						<network-role>mog_cor_B</network-role>
-						<network-ips>
-							<ip-address>107.224.36.249</ip-address>
-						</network-ips>
-						<network-ips>
-							<ip-address>107.224.36.250</ip-address>
-						</network-ips>
-						<use-dhcp>N</use-dhcp>
-					</vm-networks>
-					<vm-networks>
-						<network-role>mog_oam</network-role>
-						<network-ips>
-							<ip-address>107.239.167.250</ip-address>
-						</network-ips>
-						<network-ips>
-							<ip-address>107.239.167.251</ip-address>
-						</network-ips>
-						<use-dhcp>N</use-dhcp>
-					</vm-networks>
-				</vnf-vms>
-				<vnf-vms>
-					<vm-type>oam</vm-type>
-					<vm-names>
-						<vm-name>ZVNN1MOGX01OAM001</vm-name>
-					</vm-names>
-					<vm-names>
-						<vm-name>ZVNN1MOGX01OAM002</vm-name>
-					</vm-names>
-					<vm-count>2</vm-count>
-					<vm-networks>
-						<network-role>mog_oam</network-role>
-						<network-ips>
-							<ip-address>107.239.167.252</ip-address>
-						</network-ips>
-						<network-ips>
-							<ip-address>107.239.167.251</ip-address>
-						</network-ips>
-						<use-dhcp>N</use-dhcp>
-					</vm-networks>
-					<vm-networks>
-						<network-role>mog_cor_B</network-role>
-						<network-ips>
-							<ip-address>107.224.36.249</ip-address>
-						</network-ips>
-						<network-ips>
-							<ip-address>107.224.36.250</ip-address>
-						</network-ips>
-						<use-dhcp>N</use-dhcp>
-					</vm-networks>
-				</vnf-vms>
-				<vnf-vms>
-					<vm-type>pd</vm-type>
-					<vm-names>
-						<vm-name>ZVNN1MOGX01MPD001</vm-name>
-					</vm-names>
-					<vm-names>
-						<vm-name>ZVNN1MOGX01MPD002</vm-name>
-					</vm-names>
-					<vm-count>2</vm-count>
-					<vm-networks>
-						<network-role>mog_dmz</network-role>
-						<network-ips>
-							<ip-address>107.225.25.253</ip-address>
-						</network-ips>
-						<network-ips>
-							<ip-address>107.225.25.254</ip-address>
-						</network-ips>
-						<use-dhcp>N</use-dhcp>
-						<floating-ip>107.225.254.253</floating-ip>
-					</vm-networks>
-					<vm-networks>
-						<network-role>mog_oam</network-role>
-						<network-ips>
-							<ip-address>107.239.167.254</ip-address>
-						</network-ips>
-						<network-ips>
-							<ip-address>107.239.167.253</ip-address>
-						</network-ips>
-						<use-dhcp>N</use-dhcp>
-						<floating-ip>107.239.167.249</floating-ip>
-					</vm-networks>
-					<vm-networks>
-						<network-role>mog_exn</network-role>
-						<network-ips>
-							<ip-address>107.224.46.253</ip-address>
-						</network-ips>
-						<network-ips>
-							<ip-address>107.224.46.254</ip-address>
-						</network-ips>
-						<use-dhcp>N</use-dhcp>
-						<floating-ip>107.224.46.252</floating-ip>
-					</vm-networks>
-					<vm-networks>
-						<network-role>mog_cor_B</network-role>
-						<network-ips>
-							<ip-address>107.224.36.247</ip-address>
-						</network-ips>
-						<network-ips>
-							<ip-address>107.224.36.248</ip-address>
-						</network-ips>
-						<use-dhcp>N</use-dhcp>
-						<floating-ip>107.224.41.252</floating-ip>
-					</vm-networks>
-					<vm-networks>
-						<network-role>mog_gn</network-role>
-						<network-ips>
-							<ip-address>107.224.41.253</ip-address>
-						</network-ips>
-						<network-ips>
-							<ip-address>107.224.41.254</ip-address>
-						</network-ips>
-						<use-dhcp>N</use-dhcp>
-						<floating-ip>107.224.41.252</floating-ip>
-					</vm-networks>
-					<vm-networks>
-						<network-role>mog_cor_A</network-role>
-						<network-ips>
-							<ip-address>107.224.38.253</ip-address>
-						</network-ips>
-						<network-ips>
-							<ip-address>107.224.38.254</ip-address>
-						</network-ips>
-						<use-dhcp>N</use-dhcp>
-					</vm-networks>
-				</vnf-vms>
-				<vnf-vms>
-					<vm-type>sm</vm-type>
-					<vm-names>
-						<vm-name>ZVNN1MOGX01MSM001</vm-name>
-					</vm-names>
-					<vm-names>
-						<vm-name>ZVNN1MOGX01MSM002</vm-name>
-					</vm-names>
-					<vm-names>
-						<vm-name>ZVNN1MOGX01MSM003</vm-name>
-					</vm-names>
-					<vm-names>
-						<vm-name>ZVNN1MOGX01MSM004</vm-name>
-					</vm-names>
-					<vm-count>4</vm-count>
-					<vm-networks>
-						<network-role>mog_cor_B</network-role>
-						<network-ips>
-							<ip-address>107.224.36.243</ip-address>
-						</network-ips>
-						<network-ips>
-							<ip-address>107.224.36.244</ip-address>
-						</network-ips>
-						<network-ips>
-							<ip-address>107.224.36.245</ip-address>
-						</network-ips>
-						<network-ips>
-							<ip-address>107.224.36.246</ip-address>
-						</network-ips>
-						<use-dhcp>N</use-dhcp>
-					</vm-networks>
-				</vnf-vms>
-			</vnf-assignments>
-			<vnf-topology-identifier>
-				<vnf-name>ZVNNMOGX01_base</vnf-name>
-				<service-type>SDN-MOBILITY</service-type>
-				<vnf-type>ZVNN1MOGX01 - VF AUG 1::module-0</vnf-type>
-				<generic-vnf-type>ZVNN1MOGX01-SVC/ZVNN1MOGX01 - VF AUG 1 1</generic-vnf-type>
-				<generic-vnf-name>ZVNN1MOGX01</generic-vnf-name>
-			</vnf-topology-identifier>
-		</vnf-topology-information>
-		<request-information>
-			<request-id>9ddf628a-9eca-430e-8974-22d520a31be1</request-id>
-			<notification-url/>
-			<source>PORTAL</source>
-			<request-action>VNFActivateRequest</request-action>
-		</request-information>
-	</service-data>
-	<service-status>
-		<response-code>200</response-code>
-		<final-indicator>Y</final-indicator>
-		<request-status>synccomplete</request-status>
-		<response-timestamp>2016-08-05T16:15:19.398Z</response-timestamp>
-		<rpc-name>vnf-topology-operation</rpc-name>
-		<vnfsdn-action>VNFActivateRequest</vnfsdn-action>
-		<rpc-action>assign</rpc-action>
-	</service-status>
-</vnf-list>
-
-</output>
+<output xmlns="com:att:sdnctl:vnf">

+<vnf-list xmlns="com:att:sdnctl:vnf">

+	<vnf-id>bd1b3789-6474-4935-94b2-90b656e035d0</vnf-id>

+	<service-data>

+		<vnf-id>bd1b3789-6474-4935-94b2-90b656e035d0</vnf-id>

+		<sdnc-request-header>

+			<svc-request-id>9ddf628a-9eca-430e-8974-22d520a31be1</svc-request-id>

+			<svc-action>assign</svc-action>

+			<svc-notification-url>https://msojra.infra.aic.net:8443/adapters/rest/SDNCNotify</svc-notification-url>

+		</sdnc-request-header>

+		<service-information>

+			<subscriber-name>notsurewecare</subscriber-name>

+			<service-instance-id>bd1b3789-6474-4935-94b2-90b656e035d0</service-instance-id>

+			<service-type>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-type>

+			<service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

+		</service-information>

+		<oper-status>

+			<order-status>PendingCreate</order-status>

+		</oper-status>

+		<vnf-request-information>

+			<aic-cloud-region>VNN1CA52LCP</aic-cloud-region>

+			<vnf-name>ZVNNMOGX01_base</vnf-name>

+			<generic-vnf-id>afd0f02a-1ddb-43bb-aded-5113e46e82ae</generic-vnf-id>

+			<generic-vnf-type>ZVNN1MOGX01-SVC/ZVNN1MOGX01 - VF AUG 1 1</generic-vnf-type>

+			<generic-vnf-name>ZVNN1MOGX01</generic-vnf-name>

+			<tenant>33d209df14ac4c08ad60747185d2f3e0</tenant>

+			<vnf-id>bd1b3789-6474-4935-94b2-90b656e035d0</vnf-id>

+			<vnf-type>ZVNN1MOGX01 - VF AUG 1::module-0</vnf-type>

+		</vnf-request-information>

+		<vnf-topology-information>

+			<vnf-assignments>

+				<vnf-networks>

+					<network-role>mog_exn</network-role>

+					<network-id>03dbd833-785c-40c0-bf32-37594b5334bc</network-id>

+					<network-name>MNS-25180-P-VNNYCA01_exn_protected_net_1</network-name>

+					<contrail-network-fqdn/>

+					<subnet-id/>

+					<neutron-id>6f82d234-41a4-48e9-a9e8-415667a72929</neutron-id>

+					<sriov-vlan-filter-list>

+						<sriov-vlan-filter>filter1</sriov-vlan-filter>

+					</sriov-vlan-filter-list>

+					<sriov-vlan-filter-list>

+						<sriov-vlan-filter>filter2</sriov-vlan-filter>                         

+                     </sriov-vlan-filter-list>

+				</vnf-networks>

+				<vnf-networks>

+					<network-role>mog_oam</network-role>

+					<network-id>3f181cde-9380-4c20-9d3a-e1a4ee74f994</network-id>

+					<network-name>MNS-25180-P-VNNYCA01_oam_protected_net_1</network-name>

+					<contrail-network-fqdn/>

+					<subnet-id/>

+					<neutron-id>713b6770-13fa-4949-8dbb-a1288c5e5932</neutron-id>

+				</vnf-networks>

+				<vnf-networks>

+					<network-role>mog_cor_B</network-role>

+					<network-id>821a550a-3f50-4725-995b-f212d5caec7c</network-id>

+					<network-name>MNS-25180-P-VNNYCA01_cor_direct_net_1</network-name>

+					<contrail-network-fqdn/>

+					<subnet-id/>

+					<neutron-id>18926e56-12b6-4a4d-98b6-37e0c05626ee</neutron-id>

+				</vnf-networks>

+				<vnf-networks>

+					<network-role>mog_cor_A</network-role>

+					<network-id>3dabf5c0-cffb-420c-8960-8499c74eb25f</network-id>

+					<network-name>MNS-25180-P-VNNYCA01_cor_direct_net_2</network-name>

+					<contrail-network-fqdn/>

+					<subnet-id/>

+					<neutron-id>35530b29-a4de-48ff-a014-111110ccc652</neutron-id>

+				</vnf-networks>

+				<vnf-networks>

+					<network-role>mog_gn</network-role>

+					<network-id>3ce97321-6e7f-49af-bd12-f833e377c310</network-id>

+					<network-name>MNS-25180-P-VNNYCA01_gn_direct_net_1</network-name>

+					<contrail-network-fqdn/>

+					<subnet-id/>

+					<neutron-id>32bfdd2c-28e1-4895-87a6-373bf12c3129</neutron-id>

+				</vnf-networks>

+				<vnf-networks>

+					<network-role>mog_dmz</network-role>

+					<network-id>d43ca910-02a5-47dc-8510-100a68a3c9e0</network-id>

+					<network-name>MNS-25180-P-VNNYCA01_dmz_protected_net_1</network-name>

+					<contrail-network-fqdn/>

+					<subnet-id/>

+					<neutron-id>cb9500fb-943f-412e-aea6-458711564a75</neutron-id>

+				</vnf-networks>

+				<availability-zones>

+					<availability-zone>nova</availability-zone>

+				</availability-zones>

+				<vnf-vms>

+					<vm-type>ps</vm-type>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MPS001</vm-name>

+					</vm-names>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MPS002</vm-name>

+					</vm-names>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MPS003</vm-name>

+					</vm-names>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MPS004</vm-name>

+					</vm-names>

+					<vm-count>4</vm-count>

+					<vm-networks>

+						<network-role>mog_cor_B</network-role>

+						<network-ips>

+							<ip-address>107.224.36.251</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.36.252</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.36.253</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.36.254</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+					</vm-networks>

+				</vnf-vms>

+				<vnf-vms>

+					<vm-type>cm</vm-type>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MCM001</vm-name>

+					</vm-names>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01OAM002</vm-name>

+					</vm-names>

+					<vm-count>1</vm-count>

+					<vm-networks>

+						<network-role>mog_cor_B</network-role>

+						<network-ips>

+							<ip-address>107.224.36.249</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.36.250</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+					</vm-networks>

+					<vm-networks>

+						<network-role>mog_oam</network-role>

+						<network-ips>

+							<ip-address>107.239.167.250</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.239.167.251</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+					</vm-networks>

+				</vnf-vms>

+				<vnf-vms>

+					<vm-type>oam</vm-type>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01OAM001</vm-name>

+					</vm-names>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01OAM002</vm-name>

+					</vm-names>

+					<vm-count>2</vm-count>

+					<vm-networks>

+						<network-role>mog_oam</network-role>

+						<network-ips>

+							<ip-address>107.239.167.252</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.239.167.251</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+					</vm-networks>

+					<vm-networks>

+						<network-role>mog_cor_B</network-role>

+						<network-ips>

+							<ip-address>107.224.36.249</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.36.250</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+					</vm-networks>

+				</vnf-vms>

+				<vnf-vms>

+					<vm-type>pd</vm-type>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MPD001</vm-name>

+					</vm-names>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MPD002</vm-name>

+					</vm-names>

+					<vm-count>2</vm-count>

+					<vm-networks>

+						<network-role>mog_dmz</network-role>

+						<network-ips>

+							<ip-address>107.225.25.253</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.225.25.254</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+						<floating-ip>107.225.254.253</floating-ip>

+					</vm-networks>

+					<vm-networks>

+						<network-role>mog_oam</network-role>

+						<network-ips>

+							<ip-address>107.239.167.254</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.239.167.253</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+						<floating-ip>107.239.167.249</floating-ip>

+					</vm-networks>

+					<vm-networks>

+						<network-role>mog_exn</network-role>

+						<network-ips>

+							<ip-address>107.224.46.253</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.46.254</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+						<floating-ip>107.224.46.252</floating-ip>

+					</vm-networks>

+					<vm-networks>

+						<network-role>mog_cor_B</network-role>

+						<network-ips>

+							<ip-address>107.224.36.247</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.36.248</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+						<floating-ip>107.224.41.252</floating-ip>

+					</vm-networks>

+					<vm-networks>

+						<network-role>mog_gn</network-role>

+						<network-ips>

+							<ip-address>107.224.41.253</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.41.254</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+						<floating-ip>107.224.41.252</floating-ip>

+					</vm-networks>

+					<vm-networks>

+						<network-role>mog_cor_A</network-role>

+						<network-ips>

+							<ip-address>107.224.38.253</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.38.254</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+					</vm-networks>

+				</vnf-vms>

+				<vnf-vms>

+					<vm-type>sm</vm-type>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MSM001</vm-name>

+					</vm-names>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MSM002</vm-name>

+					</vm-names>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MSM003</vm-name>

+					</vm-names>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MSM004</vm-name>

+					</vm-names>

+					<vm-count>4</vm-count>

+					<vm-networks>

+						<network-role>mog_cor_B</network-role>

+						<network-ips>

+							<ip-address>107.224.36.243</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.36.244</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.36.245</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.36.246</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+					</vm-networks>

+				</vnf-vms>

+			</vnf-assignments>

+			<vnf-topology-identifier>

+				<vnf-name>ZVNNMOGX01_base</vnf-name>

+				<service-type>SDN-MOBILITY</service-type>

+				<vnf-type>ZVNN1MOGX01 - VF AUG 1::module-0</vnf-type>

+				<generic-vnf-type>ZVNN1MOGX01-SVC/ZVNN1MOGX01 - VF AUG 1 1</generic-vnf-type>

+				<generic-vnf-name>ZVNN1MOGX01</generic-vnf-name>

+			</vnf-topology-identifier>

+		</vnf-topology-information>

+		<request-information>

+			<request-id>9ddf628a-9eca-430e-8974-22d520a31be1</request-id>

+			<notification-url/>

+			<source>PORTAL</source>

+			<request-action>VNFActivateRequest</request-action>

+		</request-information>

+	</service-data>

+	<service-status>

+		<response-code>200</response-code>

+		<final-indicator>Y</final-indicator>

+		<request-status>synccomplete</request-status>

+		<response-timestamp>2016-08-05T16:15:19.398Z</response-timestamp>

+		<rpc-name>vnf-topology-operation</rpc-name>

+		<vnfsdn-action>VNFActivateRequest</vnfsdn-action>

+		<rpc-action>assign</rpc-action>

+	</service-status>

+</vnf-list>

+

+</output>

diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModule.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModule.xml
index c9f9cf3..9b69fdc 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModule.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModule.xml
@@ -1,141 +1,141 @@
-<output xmlns="com:att:sdnctl:vnf">
-	<vnf-list xmlns="com:att:sdnctl:vnf">
-	<vnf-id>28455973-1ee5-4ad1-8d35-c4732679743a</vnf-id>
-	<service-status>
-		<response-code>200</response-code>
-		<final-indicator>Y</final-indicator>
-		<request-status>synccomplete</request-status>
-		<response-timestamp>2016-06-08T19:44:59.138Z</response-timestamp>
-		<rpc-name>vnf-topology-operation</rpc-name>
-		<vnfsdn-action>VNFActivateRequest</vnfsdn-action>
-		<rpc-action>assign</rpc-action>
-	</service-status>
-	<service-data>
-		<vnf-id>28455973-1ee5-4ad1-8d35-c4732679743</vnf-id>
-		<service-information>
-			<subscriber-name>notsurewecare</subscriber-name>
-			<service-instance-id>28455973-1ee5-4ad1-8d35-c4732679743a</service-instance-id>
-			<service-type>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-type>
-			<service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
-		</service-information>
-		<sdnc-request-header>
-			<svc-request-id>5e168556-a5c6-4813-bff3-cc03007afbbc</svc-request-id>
-			<svc-notification-url>http://mtanjv9moja01-eth1-0.aic.cip.att.com:28080/adapters/rest/SDNCNotify</svc-notification-url>
-			<svc-action>assign</svc-action>
-		</sdnc-request-header>
-		<vnf-request-information>
-			<aic-cloud-region>AAIAIC25</aic-cloud-region>
-			<vnf-name>MSOTEST06-vSAMP3::base::module-0</vnf-name>
-			<generic-vnf-id>91ad7ab0-9ffd-471d-971c-3eb913a2cc75</generic-vnf-id>
-			<generic-vnf-type>Test/vSAMP3 1</generic-vnf-type>
-			<generic-vnf-name>MSOTEST06</generic-vnf-name>
-			<tenant>4ae1d3446a4c48b2bec44b6cfba06d68</tenant>
-			<vnf-id>28455973-1ee5-4ad1-8d35-c4732679743a</vnf-id>
-			<vnf-type>vSAMP3::base::module-0</vnf-type>
-		</vnf-request-information>
-		<oper-status>
-			<order-status>PendingCreate</order-status>			
-		</oper-status>
-		<vnf-topology-information>
-			<vnf-parameters>
-				<vnf-parameter-name>image</vnf-parameter-name>
-				<vnf-parameter-value>Ubuntu_Perf</vnf-parameter-value>
-			</vnf-parameters>
-			<vnf-parameters>
-				<vnf-parameter-name>flavor</vnf-parameter-name>
-				<vnf-parameter-value>m1.small</vnf-parameter-value>
-			</vnf-parameters>
-			<vnf-assignments>
-				<vnf-networks>
-					<network-role>int_imbl</network-role>
-					<network-id>680b7453-0ec4-4d96-b355-280d981d418f</network-id>
-					<network-name>Nimbus-25193-T-Willows2_int_imbl_net_1</network-name>
-					<contrail-network-fqdn>default-domain:Nimbus-25193-T-Willows2:Nimbus-25193-T-Willows2_int_imbl_net_1</contrail-network-fqdn>
-					<subnet-id></subnet-id>
-					<ipv6-subnet-id>775607fb-e16a-45ef-94a7-82fba0d16eec</ipv6-subnet-id>
-					<neutron-id>640d07fb-e16a-45ef-94a7-82fba0d169bf</neutron-id>
-					<sriov-vlan-filter-list>
-						<sriov-vlan-filter>filter1</sriov-vlan-filter>
-					</sriov-vlan-filter-list>
-					<sriov-vlan-filter-list>
-						<sriov-vlan-filter>filter2</sriov-vlan-filter>                         
-                     </sriov-vlan-filter-list>
-				</vnf-networks>
-				<vnf-networks>
-					<network-role>sgi_protected</network-role>
-					<network-id>f9039ce9-e3cf-4716-b2d1-ec7912178ea4</network-id>
-					<network-name>Nimbus-25193-T-Willows2_sgi_protected_net_1</network-name>
-					<contrail-network-fqdn>default-domain:Nimbus-25193-T-Willows2:Nimbus-25193-T-Willows2_sgi_protected_net_1</contrail-network-fqdn>
-					<subnet-id>b9999ce9-e3cf-4716-b2d1-ec791217678c</subnet-id>
-					<ipv6-subnet-id></ipv6-subnet-id>
-					<neutron-id>bf11bba8-b971-4ab5-8281-215b3fedcd3c</neutron-id>
-				</vnf-networks>
-				<vnf-vms>
-					<vm-type>cm</vm-type>
-					<vm-names>
-						<vm-name>ZVNN1MOGX01MCM001</vm-name>
-					</vm-names>
-					<vm-names>
-						<vm-name>ZVNN1MOGX01OAM002</vm-name>
-					</vm-names>
-					<vm-count>1</vm-count>
-					<vm-networks>
-						<network-role>mog_cor_B</network-role>
-						<network-ips>
-							<ip-address>107.224.36.249</ip-address>
-						</network-ips>
-						<network-ips>
-							<ip-address>107.224.36.250</ip-address>
-						</network-ips>
-						<network-ips-v6>
-							<ip-address-ipv6>2606:ae00:2e01:800::67</ip-address-ipv6>
-						</network-ips-v6>
-						<use-dhcp>N</use-dhcp>
-						<floating-ip>107.224.41.252</floating-ip>
-						<floating-ip-v6>2001:1890:1001:2B32::29:C</floating-ip-v6>
-					</vm-networks>
-					<vm-networks>
-						<network-role>mog_oam</network-role>
-						<network-ips>
-							<ip-address>107.239.167.250</ip-address>
-						</network-ips>
-						<network-ips>
-							<ip-address>107.239.167.251</ip-address>
-						</network-ips>
-						<network-ips-v6>
-							<ip-address-ipv6>aa::aa::aa::aa::aa::aa</ip-address-ipv6>							
-						</network-ips-v6>
-						<network-ips-v6>
-							<ip-address-ipv6>bb::bb::bb::bb::bb::bb</ip-address-ipv6>
-						</network-ips-v6>
-						<interface-route-prefixes>							
-							<interface-route-prefix-cidr>1.2.3.4/26</interface-route-prefix-cidr>
-						</interface-route-prefixes>
-						<interface-route-prefixes>							
-							<interface-route-prefix-cidr>2002::/64</interface-route-prefix-cidr>
-						</interface-route-prefixes>
-						<use-dhcp>N</use-dhcp>
-						<floating-ip-v6>1111:1890:1001:2B32::29:D</floating-ip-v6>
-					</vm-networks>
-				</vnf-vms>
-				<availability-zones>
-					<availability-zone>nova</availability-zone>
-				</availability-zones>
-			</vnf-assignments>
-			<vnf-topology-identifier>
-				<vnf-name>MSOTEST06-vSAMP3::base::module-0</vnf-name>
-				<service-type>SDN-MOBILITY</service-type>
-				<vnf-type>vSAMP3::base::module-0</vnf-type>
-				<generic-vnf-type>Test/vSAMP3 1</generic-vnf-type>
-				<generic-vnf-name>MSOTEST06</generic-vnf-name>
-			</vnf-topology-identifier>			
-		</vnf-topology-information>
-		<request-information>
-			<request-id>5e168556-a5c6-4813-bff3-cc03007afbbc</request-id>
-			<notification-url></notification-url>
-			<source>SoapUI-bns-vf-base-vSAMP3-9001</source>
-			<request-action>VNFActivateRequest</request-action>			
-		</request-information>
-	</service-data>
-</vnf-list>
-</output>
+<output xmlns="com:att:sdnctl:vnf">

+	<vnf-list xmlns="com:att:sdnctl:vnf">

+	<vnf-id>28455973-1ee5-4ad1-8d35-c4732679743a</vnf-id>

+	<service-status>

+		<response-code>200</response-code>

+		<final-indicator>Y</final-indicator>

+		<request-status>synccomplete</request-status>

+		<response-timestamp>2016-06-08T19:44:59.138Z</response-timestamp>

+		<rpc-name>vnf-topology-operation</rpc-name>

+		<vnfsdn-action>VNFActivateRequest</vnfsdn-action>

+		<rpc-action>assign</rpc-action>

+	</service-status>

+	<service-data>

+		<vnf-id>28455973-1ee5-4ad1-8d35-c4732679743</vnf-id>

+		<service-information>

+			<subscriber-name>notsurewecare</subscriber-name>

+			<service-instance-id>28455973-1ee5-4ad1-8d35-c4732679743a</service-instance-id>

+			<service-type>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-type>

+			<service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

+		</service-information>

+		<sdnc-request-header>

+			<svc-request-id>5e168556-a5c6-4813-bff3-cc03007afbbc</svc-request-id>

+			<svc-notification-url>http://mtanjv9moja01-eth1-0.aic.cip.com:28080/adapters/rest/SDNCNotify</svc-notification-url>

+			<svc-action>assign</svc-action>

+		</sdnc-request-header>

+		<vnf-request-information>

+			<aic-cloud-region>AAIAIC25</aic-cloud-region>

+			<vnf-name>MSOTEST06-vSAMP3::base::module-0</vnf-name>

+			<generic-vnf-id>91ad7ab0-9ffd-471d-971c-3eb913a2cc75</generic-vnf-id>

+			<generic-vnf-type>Test/vSAMP3 1</generic-vnf-type>

+			<generic-vnf-name>MSOTEST06</generic-vnf-name>

+			<tenant>4ae1d3446a4c48b2bec44b6cfba06d68</tenant>

+			<vnf-id>28455973-1ee5-4ad1-8d35-c4732679743a</vnf-id>

+			<vnf-type>vSAMP3::base::module-0</vnf-type>

+		</vnf-request-information>

+		<oper-status>

+			<order-status>PendingCreate</order-status>			

+		</oper-status>

+		<vnf-topology-information>

+			<vnf-parameters>

+				<vnf-parameter-name>image</vnf-parameter-name>

+				<vnf-parameter-value>Ubuntu_Perf</vnf-parameter-value>

+			</vnf-parameters>

+			<vnf-parameters>

+				<vnf-parameter-name>flavor</vnf-parameter-name>

+				<vnf-parameter-value>m1.small</vnf-parameter-value>

+			</vnf-parameters>

+			<vnf-assignments>

+				<vnf-networks>

+					<network-role>int_imbl</network-role>

+					<network-id>680b7453-0ec4-4d96-b355-280d981d418f</network-id>

+					<network-name>Nimbus-25193-T-Willows2_int_imbl_net_1</network-name>

+					<contrail-network-fqdn>default-domain:Nimbus-25193-T-Willows2:Nimbus-25193-T-Willows2_int_imbl_net_1</contrail-network-fqdn>

+					<subnet-id></subnet-id>

+					<ipv6-subnet-id>775607fb-e16a-45ef-94a7-82fba0d16eec</ipv6-subnet-id>

+					<neutron-id>640d07fb-e16a-45ef-94a7-82fba0d169bf</neutron-id>

+					<sriov-vlan-filter-list>

+						<sriov-vlan-filter>filter1</sriov-vlan-filter>

+					</sriov-vlan-filter-list>

+					<sriov-vlan-filter-list>

+						<sriov-vlan-filter>filter2</sriov-vlan-filter>                         

+                     </sriov-vlan-filter-list>

+				</vnf-networks>

+				<vnf-networks>

+					<network-role>sgi_protected</network-role>

+					<network-id>f9039ce9-e3cf-4716-b2d1-ec7912178ea4</network-id>

+					<network-name>Nimbus-25193-T-Willows2_sgi_protected_net_1</network-name>

+					<contrail-network-fqdn>default-domain:Nimbus-25193-T-Willows2:Nimbus-25193-T-Willows2_sgi_protected_net_1</contrail-network-fqdn>

+					<subnet-id>b9999ce9-e3cf-4716-b2d1-ec791217678c</subnet-id>

+					<ipv6-subnet-id></ipv6-subnet-id>

+					<neutron-id>bf11bba8-b971-4ab5-8281-215b3fedcd3c</neutron-id>

+				</vnf-networks>

+				<vnf-vms>

+					<vm-type>cm</vm-type>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MCM001</vm-name>

+					</vm-names>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01OAM002</vm-name>

+					</vm-names>

+					<vm-count>1</vm-count>

+					<vm-networks>

+						<network-role>mog_cor_B</network-role>

+						<network-ips>

+							<ip-address>107.224.36.249</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.36.250</ip-address>

+						</network-ips>

+						<network-ips-v6>

+							<ip-address-ipv6>2606:ae00:2e01:800::67</ip-address-ipv6>

+						</network-ips-v6>

+						<use-dhcp>N</use-dhcp>

+						<floating-ip>107.224.41.252</floating-ip>

+						<floating-ip-v6>2001:1890:1001:2B32::29:C</floating-ip-v6>

+					</vm-networks>

+					<vm-networks>

+						<network-role>mog_oam</network-role>

+						<network-ips>

+							<ip-address>107.239.167.250</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.239.167.251</ip-address>

+						</network-ips>

+						<network-ips-v6>

+							<ip-address-ipv6>aa::aa::aa::aa::aa::aa</ip-address-ipv6>							

+						</network-ips-v6>

+						<network-ips-v6>

+							<ip-address-ipv6>bb::bb::bb::bb::bb::bb</ip-address-ipv6>

+						</network-ips-v6>

+						<interface-route-prefixes>							

+							<interface-route-prefix-cidr>1.2.3.4/26</interface-route-prefix-cidr>

+						</interface-route-prefixes>

+						<interface-route-prefixes>							

+							<interface-route-prefix-cidr>2002::/64</interface-route-prefix-cidr>

+						</interface-route-prefixes>

+						<use-dhcp>N</use-dhcp>

+						<floating-ip-v6>1111:1890:1001:2B32::29:D</floating-ip-v6>

+					</vm-networks>

+				</vnf-vms>

+				<availability-zones>

+					<availability-zone>nova</availability-zone>

+				</availability-zones>

+			</vnf-assignments>

+			<vnf-topology-identifier>

+				<vnf-name>MSOTEST06-vSAMP3::base::module-0</vnf-name>

+				<service-type>SDN-MOBILITY</service-type>

+				<vnf-type>vSAMP3::base::module-0</vnf-type>

+				<generic-vnf-type>Test/vSAMP3 1</generic-vnf-type>

+				<generic-vnf-name>MSOTEST06</generic-vnf-name>

+			</vnf-topology-identifier>			

+		</vnf-topology-information>

+		<request-information>

+			<request-id>5e168556-a5c6-4813-bff3-cc03007afbbc</request-id>

+			<notification-url></notification-url>

+			<source>SoapUI-bns-vf-base-vSAMP3-9001</source>

+			<request-action>VNFActivateRequest</request-action>			

+		</request-information>

+	</service-data>

+</vnf-list>

+</output>

diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-lukewarm.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-lukewarm.xml
index ad3c359..cfbf903 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-lukewarm.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-lukewarm.xml
@@ -1,10 +1,10 @@
-<vf-module xmlns="http://com.att.aai.inventory/v7">
-	<vf-module-id>lukewarm</vf-module-id>
-	<vf-module-name>PCRF::module-1</vf-module-name>
-	<heat-stack-id>slowburn</heat-stack-id>
-	<orchestration-status>pending-create</orchestration-status>
-	<is-base-vf-module>true</is-base-vf-module>
-	<resource-version>330-90</resource-version>
-	<persona-model-id>introvert</persona-model-id>
-	<persona-model-version>2.0</persona-model-version>
+<vf-module xmlns="http://com.aai.inventory/v7">

+	<vf-module-id>lukewarm</vf-module-id>

+	<vf-module-name>PCRF::module-1</vf-module-name>

+	<heat-stack-id>slowburn</heat-stack-id>

+	<orchestration-status>pending-create</orchestration-status>

+	<is-base-vf-module>true</is-base-vf-module>

+	<resource-version>330-90</resource-version>

+	<persona-model-id>introvert</persona-model-id>

+	<persona-model-version>2.0</persona-model-version>

 </vf-module>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-new.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-new.xml
index eba91a7..27c8ecf 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-new.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-new.xml
@@ -1,9 +1,9 @@
-<vf-module xmlns="http://com.att.aai.inventory/v7">
-	<vf-module-id>b37d96db-7d2c-47ce-bf61-a6c7b82fe161</vf-module-id>
-	<vf-module-name>PCRF::module-0-2</vf-module-name>
-	<persona-model-id>00000000-0000-0000-0000-000000000000</persona-model-id>
-	<persona-model-version>1.0</persona-model-version>
-	<is-base-vf-module>false</is-base-vf-module>
-	<orchestration-status>pending-create</orchestration-status>
-	<resource-version>330-90</resource-version>
+<vf-module xmlns="http://com.aai.inventory/v7">

+	<vf-module-id>b37d96db-7d2c-47ce-bf61-a6c7b82fe161</vf-module-id>

+	<vf-module-name>PCRF::module-0-2</vf-module-name>

+	<persona-model-id>00000000-0000-0000-0000-000000000000</persona-model-id>

+	<persona-model-version>1.0</persona-model-version>

+	<is-base-vf-module>false</is-base-vf-module>

+	<orchestration-status>pending-create</orchestration-status>

+	<resource-version>330-90</resource-version>

 </vf-module>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml
index 6d365f7..3370e33 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml
@@ -1,27 +1,27 @@
-<vf-module xmlns="http://com.att.aai.inventory/v7">
-	<vf-module-id>supercool</vf-module-id>
-	<vf-module-name>PCRF::module-2</vf-module-name>
-	<heat-stack-id>fastburn</heat-stack-id>
-	<orchestration-status>pending-create</orchestration-status>
-	<is-base-vf-module>false</is-base-vf-module>
-	<resource-version>330-89</resource-version>
-	<persona-model-id>introvert</persona-model-id>
-	<persona-model-version>2.0</persona-model-version>
-	<relationship-list>
-		<relationship>
-			<related-to>volume-group</related-to>
-			<relationship-data>
-				<relationship-key>cloud-region.cloud-owner</relationship-key>
-				<relationship-value>att-aic</relationship-value>
-			</relationship-data>
-			<relationship-data>
-				<relationship-key>cloud-region.cloud-region-id</relationship-key>
-				<relationship-value>pdk1</relationship-value>
-			</relationship-data>
-			<relationship-data>
-				<relationship-key>volume-group.volume-group-id</relationship-key>
-				<relationship-value>78987</relationship-value>
-			</relationship-data>
-		</relationship>
-	</relationship-list>
+<vf-module xmlns="http://com.aai.inventory/v7">

+	<vf-module-id>supercool</vf-module-id>

+	<vf-module-name>PCRF::module-2</vf-module-name>

+	<heat-stack-id>fastburn</heat-stack-id>

+	<orchestration-status>pending-create</orchestration-status>

+	<is-base-vf-module>false</is-base-vf-module>

+	<resource-version>330-89</resource-version>

+	<persona-model-id>introvert</persona-model-id>

+	<persona-model-version>2.0</persona-model-version>

+	<relationship-list>

+		<relationship>

+			<related-to>volume-group</related-to>

+			<relationship-data>

+				<relationship-key>cloud-region.cloud-owner</relationship-key>

+				<relationship-value>att-aic</relationship-value>

+			</relationship-data>

+			<relationship-data>

+				<relationship-key>cloud-region.cloud-region-id</relationship-key>

+				<relationship-value>pdk1</relationship-value>

+			</relationship-data>

+			<relationship-data>

+				<relationship-key>volume-group.volume-group-id</relationship-key>

+				<relationship-value>78987</relationship-value>

+			</relationship-data>

+		</relationship>

+	</relationship-list>

 </vf-module>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VolumeGroup.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VolumeGroup.xml
index 241e5e3..b44c977 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VolumeGroup.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VolumeGroup.xml
@@ -1,25 +1,25 @@
-  <volume-group xmlns="http://com.att.aai.inventory/v7">
-         <volume-group-id>78987</volume-group-id>
-         <volume-group-name>Volume_2</volume-group-name>
-         <heat-stack-id>slowburn</heat-stack-id>
-         <vnf-type>pcrf-capacity</vnf-type>
-         <orchestration-status>Active</orchestration-status>
-         <resource-version>0000020</resource-version>
-         <relationship-list>
-            <relationship>
-               <related-to>tenant</related-to>
-               <relationship-data>
-                  <relationship-key>cloud-region.cloud-owner</relationship-key>
-                  <relationship-value>att-aic</relationship-value>
-               </relationship-data>
-               <relationship-data>
-                  <relationship-key>cloud-region.cloud-region-id</relationship-key>
-                  <relationship-value>MDTWNJ21</relationship-value>
-               </relationship-data>
-               <relationship-data>
-                  <relationship-key>tenant.tenant-id</relationship-key>
-                  <relationship-value>fba1bd1e195a404cacb9ce17a9b2b421</relationship-value>
-               </relationship-data>
-            </relationship>
-         </relationship-list>
+  <volume-group xmlns="http://com.aai.inventory/v7">

+         <volume-group-id>78987</volume-group-id>

+         <volume-group-name>Volume_2</volume-group-name>

+         <heat-stack-id>slowburn</heat-stack-id>

+         <vnf-type>pcrf-capacity</vnf-type>

+         <orchestration-status>Active</orchestration-status>

+         <resource-version>0000020</resource-version>

+         <relationship-list>

+            <relationship>

+               <related-to>tenant</related-to>

+               <relationship-data>

+                  <relationship-key>cloud-region.cloud-owner</relationship-key>

+                  <relationship-value>att-aic</relationship-value>

+               </relationship-data>

+               <relationship-data>

+                  <relationship-key>cloud-region.cloud-region-id</relationship-key>

+                  <relationship-value>MDTWNJ21</relationship-value>

+               </relationship-data>

+               <relationship-data>

+                  <relationship-key>tenant.tenant-id</relationship-key>

+                  <relationship-value>fba1bd1e195a404cacb9ce17a9b2b421</relationship-value>

+               </relationship-data>

+            </relationship>

+         </relationship-list>

       </volume-group>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/aai-volume-group-id-info.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/aai-volume-group-id-info.xml
index 37c5155..396f553 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/aai-volume-group-id-info.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/aai-volume-group-id-info.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:volume-group xmlns:tns="http://com.att.aai.inventory/v6" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://com.att.aai.inventory/v6 aai_schema_v6.xsd ">
-  <tns:volume-group-id>VOLUME_GROUP_ID_1</tns:volume-group-id>
-  <tns:volume-group-name>VOLUME_GROUP_ID_1_NAME</tns:volume-group-name>
-  <tns:heat-stack-id>heat-stack-id</tns:heat-stack-id>
-  <tns:vnf-type>vnf-type</tns:vnf-type>
-  <tns:orchestration-status>OK</tns:orchestration-status>
-  <tns:resource-version>1</tns:resource-version>
-  <tns:relationship-list>
-            <tns:relationship>
-               <tns:related-to>tenant</tns:related-to>
-              	 <tns:relationship-data>
-                  <tns:relationship-key>cloud-region.cloud-owner</tns:relationship-key>
-                  <tns:relationship-value>att-aic</tns:relationship-value>
-               </tns:relationship-data>
-               <tns:relationship-data>
-                  <tns:relationship-key>cloud-region.cloud-region-id</tns:relationship-key>
-                  <tns:relationship-value>pdk1</tns:relationship-value>
-               </tns:relationship-data>
-               <tns:relationship-data>
-                  <tns:relationship-key>tenant.tenant-id</tns:relationship-key>
-                  <tns:relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0cg</tns:relationship-value>
-               </tns:relationship-data>
-              </tns:relationship>
-   </tns:relationship-list>
- </tns:volume-group>
- 
-
+<?xml version="1.0" encoding="UTF-8"?>

+<tns:volume-group xmlns:tns="http://com.aai.inventory/v6" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://com.aai.inventory/v6 aai_schema_v6.xsd ">

+  <tns:volume-group-id>VOLUME_GROUP_ID_1</tns:volume-group-id>

+  <tns:volume-group-name>VOLUME_GROUP_ID_1_NAME</tns:volume-group-name>

+  <tns:heat-stack-id>heat-stack-id</tns:heat-stack-id>

+  <tns:vnf-type>vnf-type</tns:vnf-type>

+  <tns:orchestration-status>OK</tns:orchestration-status>

+  <tns:resource-version>1</tns:resource-version>

+  <tns:relationship-list>

+            <tns:relationship>

+               <tns:related-to>tenant</tns:related-to>

+              	 <tns:relationship-data>

+                  <tns:relationship-key>cloud-region.cloud-owner</tns:relationship-key>

+                  <tns:relationship-value>att-aic</tns:relationship-value>

+               </tns:relationship-data>

+               <tns:relationship-data>

+                  <tns:relationship-key>cloud-region.cloud-region-id</tns:relationship-key>

+                  <tns:relationship-value>pdk1</tns:relationship-value>

+               </tns:relationship-data>

+               <tns:relationship-data>

+                  <tns:relationship-key>tenant.tenant-id</tns:relationship-key>

+                  <tns:relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0cg</tns:relationship-value>

+               </tns:relationship-data>

+              </tns:relationship>

+   </tns:relationship-list>

+ </tns:volume-group>

+ 

+

diff --git a/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties b/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties
index f1a8222..133f585 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties
+++ b/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties
@@ -1,86 +1,86 @@
-# Default URN Mappings for unit tests
-
-mso.rollback=true
-
-canopi.auth=757A94191D685FD2092AC1490730A4FC
-csi.aots.addincidentmanagement.endpoint=http://localhost:28090/AddIncidentManagementTicketRequest
-csi.networkstatus.endpoint=http://localhost:28090/SendManagedNetworkStatusNotification
-mso.csi.pwd=4EA237303511EFBBC37F17A351562131
-mso.csi.usrname=mso
-mso.msoKey=07a7159d3bf51a0e53be7a8f89699be7
-
-mso.adapters.completemsoprocess.endpoint=http://localhost:28090/CompleteMsoProcess
-
-mso.adapters.db.endpoint=http://localhost:28090/dbadapters/RequestsDbAdapter
-mso.adapters.db.auth=757A94191D685FD2092AC1490730A4FC
-
-mso.adapters.network.endpoint=http://localhost:28090/networks/NetworkAdapter
-mso.adapters.network.rest.endpoint=http://localhost:28090/networks/NetworkAdapter
-
-mso.adapters.po.auth=757A94191D685FD2092AC1490730A4FC
-mso.adapters.po.password=3141634BF7E070AA289CF2892C986C0B
-mso.po.timeout=PT60S
-
-aai.auth=757A94191D685FD2092AC1490730A4FC
-
-mso.adapters.sdnc.endpoint=http://localhost:28090/SDNCAdapter
-mso.adapters.sdnc.rest.endpoint=http://localhost:28090/SDNCAdapter/v1/sdnc
-mso.adapters.sdnc.timeout=PT60S
-mso.sdnc.firewall.yang.model=http://com/openecomp/svc/mis/firewall-lite-gui
-mso.sdnc.firewall.yang.model.version=2015-05-15
-mso.sdnc.password=3141634BF7E070AA289CF2892C986C0B
-mso.sdnc.timeout.firewall.minutes=20
-mso.callbackRetryAttempts=5
-mso.sdnc.timeout=PT10S
-mso.sdnc.timeout.ucpe.async.hours=120
-mso.sdnc.timeout.ucpe.async.minutes=5
-mso.workflow.message.endpoint=http://localhost:28080/mso/WorkflowMesssage
-mso.workflow.sdncadapter.callback=http://localhost:28080/mso/SDNCAdapterCallbackService
-
-mso.catalog.db.endpoint=http://localhost:28090/
-
-mso.adapters.tenant.endpoint=http://localhost:28090/tenantAdapterMock
-mso.adapters.vnf-async.endpoint=http://localhost:28090/vnfs/VnfAdapterAsync
-mso.adapters.vnf.endpoint=http://localhost:28090/vnfs/VnfAdapter
-mso.adapters.vnf.rest.endpoint=http://localhost:28090/vnfs/v1/vnfs
-mso.workflow.vnfadapter.create.callback=http://localhost:28080/mso/vnfAdapterNotify
-mso.workflow.vnfadapter.delete.callback=http://localhost:28080/mso/vnfAdapterNotify
-mso.workflow.vnfadapter.query.callback=http://localhost:28080/mso/services/VNFAdapterQuerCallbackV1
-mso.workflow.vnfadapter.rollback.callback=http://localhost:28080/mso/vnfAdapterNotify
-mso.workflow.createvce.delay.seconds=1
-mso.infra.customer.id=testCustIdInfra
-
-aai.endpoint=http://localhost:28090
-
-# AAI version mappings
-
-# Example to override default version for a resource:
-#mso.workflow.default.aai.vce.version=6
-#mso.workflow.default.aai.v6.vce.uri=/aai/v6/network/vces/vce
-
-mso.workflow.global.default.aai.version=8
-mso.workflow.default.aai.cloud-region.version=9
-mso.workflow.default.aai.generic-vnf.version=9
-
-mso.workflow.default.aai.v9.cloud-region.uri=/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic
-mso.workflow.default.aai.v8.customer.uri=/aai/v8/business/customers/customer
-mso.workflow.default.aai.v8.generic-query.uri=/aai/v8/search/generic-query
-mso.workflow.default.aai.v9.generic-vnf.uri=/aai/v9/network/generic-vnfs/generic-vnf
-mso.workflow.default.aai.v8.l3-network.uri=/aai/v8/network/l3-networks/l3-network
-mso.workflow.default.aai.v8.network-policy.uri=/aai/v8/network/network-policies/network-policy
-mso.workflow.default.aai.v8.nodes-query.uri=/aai/v8/search/nodes-query
-mso.workflow.default.aai.v8.route-table-reference.uri=/aai/v8/network/route-table-references/route-table-reference
-mso.workflow.default.aai.v8.tenant.uri=/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant
-mso.workflow.default.aai.v8.vce.uri=/aai/v8/network/vces/vce
-mso.workflow.default.aai.v8.vpn-binding.uri=/aai/v8/network/vpn-bindings/vpn-binding
-
-
-log.debug.CompleteMsoProcess=true
-log.debug.CreateNetworkInstanceInfra=true
-log.debug.CreateServiceInstanceInfra=true
-log.debug.DeleteNetworkInstanceInfra=true
-log.debug.FalloutHandler=true
-log.debug.GenericGetService=true
-log.debug.sdncAdapter=true
-log.debug.UpdateNetworkInstanceInfra=true
+# Default URN Mappings for unit tests

+

+mso.rollback=true

+

+canopi.auth=757A94191D685FD2092AC1490730A4FC

+csi.aots.addincidentmanagement.endpoint=http://localhost:28090/AddIncidentManagementTicketRequest

+csi.networkstatus.endpoint=http://localhost:28090/SendManagedNetworkStatusNotification

+mso.csi.pwd=4EA237303511EFBBC37F17A351562131

+mso.csi.usrname=mso

+mso.msoKey=07a7159d3bf51a0e53be7a8f89699be7

+

+mso.adapters.completemsoprocess.endpoint=http://localhost:28090/CompleteMsoProcess

+

+mso.adapters.db.endpoint=http://localhost:28090/dbadapters/RequestsDbAdapter

+mso.adapters.db.auth=757A94191D685FD2092AC1490730A4FC

+

+mso.adapters.network.endpoint=http://localhost:28090/networks/NetworkAdapter

+mso.adapters.network.rest.endpoint=http://localhost:28090/networks/NetworkAdapter

+

+mso.adapters.po.auth=757A94191D685FD2092AC1490730A4FC

+mso.adapters.po.password=3141634BF7E070AA289CF2892C986C0B

+mso.po.timeout=PT60S

+

+aai.auth=757A94191D685FD2092AC1490730A4FC

+

+mso.adapters.sdnc.endpoint=http://localhost:28090/SDNCAdapter

+mso.adapters.sdnc.rest.endpoint=http://localhost:28090/SDNCAdapter/v1/sdnc

+mso.adapters.sdnc.timeout=PT60S

+mso.sdnc.firewall.yang.model=http://com/openecomp/svc/mis/firewall-lite-gui

+mso.sdnc.firewall.yang.model.version=2015-05-15

+mso.sdnc.password=3141634BF7E070AA289CF2892C986C0B

+mso.sdnc.timeout.firewall.minutes=20

+mso.callbackRetryAttempts=5

+mso.sdnc.timeout=PT10S

+mso.sdnc.timeout.ucpe.async.hours=120

+mso.sdnc.timeout.ucpe.async.minutes=5

+mso.workflow.message.endpoint=http://localhost:28080/mso/WorkflowMesssage

+mso.workflow.sdncadapter.callback=http://localhost:28080/mso/SDNCAdapterCallbackService

+

+mso.catalog.db.endpoint=http://localhost:28090/

+

+mso.adapters.tenant.endpoint=http://localhost:28090/tenantAdapterMock

+mso.adapters.vnf-async.endpoint=http://localhost:28090/vnfs/VnfAdapterAsync

+mso.adapters.vnf.endpoint=http://localhost:28090/vnfs/VnfAdapter

+mso.adapters.vnf.rest.endpoint=http://localhost:28090/vnfs/v1/vnfs

+mso.workflow.vnfadapter.create.callback=http://localhost:28080/mso/vnfAdapterNotify

+mso.workflow.vnfadapter.delete.callback=http://localhost:28080/mso/vnfAdapterNotify

+mso.workflow.vnfadapter.query.callback=http://localhost:28080/mso/services/VNFAdapterQuerCallbackV1

+mso.workflow.vnfadapter.rollback.callback=http://localhost:28080/mso/vnfAdapterNotify

+mso.workflow.createvce.delay.seconds=1

+mso.infra.customer.id=testCustIdInfra

+

+aai.endpoint=http://localhost:28090

+

+# AAI version mappings

+

+# Example to override default version for a resource:

+#mso.workflow.default.aai.vce.version=6

+#mso.workflow.default.aai.v6.vce.uri=/aai/v6/network/vces/vce

+

+mso.workflow.global.default.aai.version=8

+mso.workflow.default.aai.cloud-region.version=9

+mso.workflow.default.aai.generic-vnf.version=9

+

+mso.workflow.default.aai.v9.cloud-region.uri=/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic

+mso.workflow.default.aai.v8.customer.uri=/aai/v8/business/customers/customer

+mso.workflow.default.aai.v8.generic-query.uri=/aai/v8/search/generic-query

+mso.workflow.default.aai.v9.generic-vnf.uri=/aai/v9/network/generic-vnfs/generic-vnf

+mso.workflow.default.aai.v8.l3-network.uri=/aai/v8/network/l3-networks/l3-network

+mso.workflow.default.aai.v8.network-policy.uri=/aai/v8/network/network-policies/network-policy

+mso.workflow.default.aai.v8.nodes-query.uri=/aai/v8/search/nodes-query

+mso.workflow.default.aai.v8.route-table-reference.uri=/aai/v8/network/route-table-references/route-table-reference

+mso.workflow.default.aai.v8.tenant.uri=/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant

+mso.workflow.default.aai.v8.vce.uri=/aai/v8/network/vces/vce

+mso.workflow.default.aai.v8.vpn-binding.uri=/aai/v8/network/vpn-bindings/vpn-binding

+mso.workflow.notification.name=GenericNotificationService

+

+log.debug.CompleteMsoProcess=true

+log.debug.CreateNetworkInstanceInfra=true

+log.debug.CreateServiceInstanceInfra=true

+log.debug.DeleteNetworkInstanceInfra=true

+log.debug.FalloutHandler=true

+log.debug.GenericGetService=true

+log.debug.sdncAdapter=true

+log.debug.UpdateNetworkInstanceInfra=true

 log.debug.VnfAdapterRestV1=true
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/sdncCallbackErrorResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/sdncCallbackErrorResponse.xml
index df3a4c4..136917c 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/sdncCallbackErrorResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/sdncCallbackErrorResponse.xml
@@ -1 +1 @@
-<SDNCAdapterCallbackRequest xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1"><CallbackHeader><RequestId>1a152f97-566e-4f22-b17b-761f807bfedc</RequestId><ResponseCode>404</ResponseCode><ResponseMessage>Error processing request to SDNC. Not Found. https://sdncodl.it.us.aic.cip.att.com:8443/restconf/config/L3SDN-API:services/layer3-service-list/AS%2FVLXM%2F000199%2F%2FSB_INTERNET. SDNC Returned-[error-type:application, error-tag:data-missing, error-message:Request could not be completed because the relevant data model content does not exist.]</ResponseMessage></CallbackHeader></SDNCAdapterCallbackRequest>
\ No newline at end of file
+<SDNCAdapterCallbackRequest xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1"><CallbackHeader><RequestId>1a152f97-566e-4f22-b17b-761f807bfedc</RequestId><ResponseCode>404</ResponseCode><ResponseMessage>Error processing request to SDNC. Not Found. https://sdncodl.it.us.aic.cip.com:8443/restconf/config/L3SDN-API:services/layer3-service-list/AS%2FVLXM%2F000199%2F%2FSB_INTERNET. SDNC Returned-[error-type:application, error-tag:data-missing, error-message:Request could not be completed because the relevant data model content does not exist.]</ResponseMessage></CallbackHeader></SDNCAdapterCallbackRequest>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/sdncDeleteResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/sdncDeleteResponse.xml
index d656d04..c8a2e30 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/sdncDeleteResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/sdncDeleteResponse.xml
@@ -1,212 +1,212 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<sdncadapterworkflow:SDNCAdapterWorkflowResponse
-	xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1">
-	<sdncadapterworkflow:response-data>
-		<tag0:RequestData
-			xmlns:tag0="http://org.openecomp/workflow/sdnc/adapter/schema/v1"
-			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">
-			<output xmlns="com:att:sdnctl:nbncapi">
-				<ack-final-indicator>Y</ack-final-indicator>
-  <svc-request-id>SK-2016-10-22-001</svc-request-id>
-  <nbnc-response-information>
-    <response-info>
-      <result>SUCCESS</result>
-      <aai-status>ERROR</aai-status>
-    </response-info>
-    <virtual-datacenter-list>
-      <vdc-id>15001417</vdc-id>
-      <router-list>
-        <router-name>ALPRTR2</router-name>
-        <ipe-loopback-address>1.1.1.2</ipe-loopback-address>
-        <vlan-list>
-          <vlan-id>1255.ae81</vlan-id>
-          <border-element-type>VDBE</border-element-type>
-          <border-element-tangibility>VIRTUAL</border-element-tangibility>
-          <port-id></port-id>
-          <border-element-id>ALPVDBE1</border-element-id>
-          <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>
-          <lag-id>ae81</lag-id>
-          <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>
-        </vlan-list>
-        <vlan-list>
-          <vlan-id>1995.ae81</vlan-id>
-          <border-element-type>ASBG</border-element-type>
-          <border-element-tangibility>VIRTUAL</border-element-tangibility>
-          <port-id></port-id>
-          <border-element-id>ALPASBG1</border-element-id>
-          <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>
-          <lag-id>ae81</lag-id>
-          <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>
-        </vlan-list>
-        <vlan-list>
-          <vlan-id>85.xe-10/0/2</vlan-id>
-          <border-element-type>BGF2</border-element-type>
-          <border-element-tangibility>PHYSICAL</border-element-tangibility>
-          <port-id>xe-10/0/2</port-id>
-          <border-element-id>ALPBGF2</border-element-id>
-          <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>
-          <lag-id></lag-id>
-          <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>
-        </vlan-list>
-        <vlan-list>
-          <vlan-id>85.xe-10/0/1</vlan-id>
-          <border-element-type>BGF1</border-element-type>
-          <border-element-tangibility>PHYSICAL</border-element-tangibility>
-          <port-id>xe-10/0/1</port-id>
-          <border-element-id>ALPBGF1</border-element-id>
-          <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>
-          <lag-id></lag-id>
-          <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>
-        </vlan-list>
-        <ipe-id>2</ipe-id>
-      </router-list>
-      <router-list>
-        <router-name>ALPRTR1</router-name>
-        <ipe-loopback-address>1.1.1.1</ipe-loopback-address>
-        <vlan-list>
-          <vlan-id>1255.ae81</vlan-id>
-          <border-element-type>VDBE</border-element-type>
-          <border-element-tangibility>VIRTUAL</border-element-tangibility>
-          <port-id></port-id>
-          <border-element-id>ALPVDBE1</border-element-id>
-          <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>
-          <lag-id>ae81</lag-id>
-          <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>
-        </vlan-list>
-        <vlan-list>
-          <vlan-id>1995.ae81</vlan-id>
-          <border-element-type>ASBG</border-element-type>
-          <border-element-tangibility>VIRTUAL</border-element-tangibility>
-          <port-id></port-id>
-          <border-element-id>ALPASBG1</border-element-id>
-         <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>
-          <lag-id>ae81</lag-id>
-          <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>
-        </vlan-list>
-        <vlan-list>
-          <vlan-id>85.xe-10/0/2</vlan-id>
-          <border-element-type>BGF2</border-element-type>
-          <border-element-tangibility>PHYSICAL</border-element-tangibility>
-          <port-id>xe-10/0/2</port-id>
-          <border-element-id>ALPBGF2</border-element-id>
-          <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>
-          <lag-id></lag-id>
-          <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>
-        </vlan-list>
-        <vlan-list>
-          <vlan-id>85.xe-10/0/1</vlan-id>
-          <border-element-type>BGF1</border-element-type>
-          <border-element-tangibility>PHYSICAL</border-element-tangibility>
-          <port-id>xe-10/0/1</port-id>
-          <border-element-id>ALPBGF1</border-element-id>
-          <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>
-          <lag-id></lag-id>
-          <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>
-        </vlan-list>
-        <ipe-id>1</ipe-id>
-      </router-list>
-    </virtual-datacenter-list>
-    <virtual-datacenter-list>
-      <vdc-id>15001418</vdc-id>
-      <router-list>
-        <router-name>SANRTR1</router-name>
-        <ipe-loopback-address>2.1.1.1</ipe-loopback-address>
-        <vlan-list>
-          <vlan-id>1255.ae81</vlan-id>
-          <border-element-type>VDBE</border-element-type>
-          <border-element-tangibility>VIRTUAL</border-element-tangibility>
-          <port-id></port-id>
-          <border-element-id>SANVDBE1</border-element-id>
-          <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>
-          <lag-id>ae81</lag-id>
-          <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>
-        </vlan-list>
-        <vlan-list>
-          <vlan-id>1995.ae81</vlan-id>
-          <border-element-type>ASBG</border-element-type>
-          <border-element-tangibility>VIRTUAL</border-element-tangibility>
-          <port-id></port-id>
-          <border-element-id>SANASBG1</border-element-id>
-          <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>
-          <lag-id>ae81</lag-id>
-          <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>
-        </vlan-list>
-        <vlan-list>
-          <vlan-id>85.xe-10/0/2</vlan-id>
-          <border-element-type>BGF2</border-element-type>
-          <border-element-tangibility>PHYSICAL</border-element-tangibility>
-          <port-id>xe-10/0/2</port-id>
-          <border-element-id>SANBGF2</border-element-id>
-          <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>
-          <lag-id></lag-id>
-          <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>
-        </vlan-list>
-        <vlan-list>
-          <vlan-id>85.xe-10/0/1</vlan-id>
-          <border-element-type>BGF1</border-element-type>
-          <border-element-tangibility>PHYSICAL</border-element-tangibility>
-          <port-id>xe-10/0/1</port-id>
-          <border-element-id>SANBGF1</border-element-id>
-          <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>
-          <lag-id></lag-id>
-          <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>
-        </vlan-list>
-        <ipe-id>1</ipe-id>
-      </router-list>
-      <router-list>
-        <router-name>SANRTR2</router-name>
-        <ipe-loopback-address>2.1.1.2</ipe-loopback-address>
-        <vlan-list>
-          <vlan-id>1255.ae81</vlan-id>
-          <border-element-type>VDBE</border-element-type>
-          <border-element-tangibility>VIRTUAL</border-element-tangibility>
-          <port-id></port-id>
-          <border-element-id>SANVDBE1</border-element-id>
-          <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>
-          <lag-id>ae81</lag-id>
-          <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>
-        </vlan-list>
-        <vlan-list>
-          <vlan-id>1995.ae81</vlan-id>
-          <border-element-type>ASBG</border-element-type>
-          <border-element-tangibility>VIRTUAL</border-element-tangibility>
-          <port-id></port-id>
-          <border-element-id>SANASBG1</border-element-id>
-          <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>
-          <lag-id>ae81</lag-id>
-          <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>
-        </vlan-list>
-        <vlan-list>
-          <vlan-id>85.xe-10/0/2</vlan-id>
-          <border-element-type>BGF2</border-element-type>
-          <border-element-tangibility>PHYSICAL</border-element-tangibility>
-          <port-id>xe-10/0/2</port-id>
-          <border-element-id>SANBGF2</border-element-id>
-          <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>
-          <lag-id></lag-id>
-          <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>
-        </vlan-list>
-        <vlan-list>
-          <vlan-id>85.xe-10/0/1</vlan-id>
-          <border-element-type>BGF1</border-element-type>
-          <border-element-tangibility>PHYSICAL</border-element-tangibility>
-          <port-id>xe-10/0/1</port-id>
-          <border-element-id>SANBGF1</border-element-id>
-          <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>
-          <lag-id></lag-id>
-          <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>
-        </vlan-list>
-        <ipe-id>2</ipe-id>
-      </router-list>
-    </virtual-datacenter-list>
-    <service-type>ATT-COLLABORATE</service-type>
-    <interface-status>DISABLE</interface-status>
-    <customer-id>custid-888</customer-id>
-    <service-instance-id>SII-2016-10-22-001</service-instance-id>
-    <provision-type>CUSTOMER</provision-type>
-    <vni-id>100668</vni-id>
-  </nbnc-response-information>
-			</output>
-		</tag0:RequestData>
-	</sdncadapterworkflow:response-data>
+<?xml version="1.0" encoding="UTF-8"?> 

+<sdncadapterworkflow:SDNCAdapterWorkflowResponse

+	xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1">

+	<sdncadapterworkflow:response-data>

+		<tag0:RequestData

+			xmlns:tag0="http://org.openecomp/workflow/sdnc/adapter/schema/v1"

+			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">

+			<output xmlns="com:att:sdnctl:nbncapi">

+				<ack-final-indicator>Y</ack-final-indicator>

+  <svc-request-id>SK-2016-10-22-001</svc-request-id>

+  <nbnc-response-information>

+    <response-info>

+      <result>SUCCESS</result>

+      <aai-status>ERROR</aai-status>

+    </response-info>

+    <virtual-datacenter-list>

+      <vdc-id>15001417</vdc-id>

+      <router-list>

+        <router-name>ALPRTR2</router-name>

+        <ipe-loopback-address>1.1.1.2</ipe-loopback-address>

+        <vlan-list>

+          <vlan-id>1255.ae81</vlan-id>

+          <border-element-type>VDBE</border-element-type>

+          <border-element-tangibility>VIRTUAL</border-element-tangibility>

+          <port-id></port-id>

+          <border-element-id>ALPVDBE1</border-element-id>

+          <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>

+          <lag-id>ae81</lag-id>

+          <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>

+        </vlan-list>

+        <vlan-list>

+          <vlan-id>1995.ae81</vlan-id>

+          <border-element-type>ASBG</border-element-type>

+          <border-element-tangibility>VIRTUAL</border-element-tangibility>

+          <port-id></port-id>

+          <border-element-id>ALPASBG1</border-element-id>

+          <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>

+          <lag-id>ae81</lag-id>

+          <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>

+        </vlan-list>

+        <vlan-list>

+          <vlan-id>85.xe-10/0/2</vlan-id>

+          <border-element-type>BGF2</border-element-type>

+          <border-element-tangibility>PHYSICAL</border-element-tangibility>

+          <port-id>xe-10/0/2</port-id>

+          <border-element-id>ALPBGF2</border-element-id>

+          <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>

+          <lag-id></lag-id>

+          <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>

+        </vlan-list>

+        <vlan-list>

+          <vlan-id>85.xe-10/0/1</vlan-id>

+          <border-element-type>BGF1</border-element-type>

+          <border-element-tangibility>PHYSICAL</border-element-tangibility>

+          <port-id>xe-10/0/1</port-id>

+          <border-element-id>ALPBGF1</border-element-id>

+          <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>

+          <lag-id></lag-id>

+          <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>

+        </vlan-list>

+        <ipe-id>2</ipe-id>

+      </router-list>

+      <router-list>

+        <router-name>ALPRTR1</router-name>

+        <ipe-loopback-address>1.1.1.1</ipe-loopback-address>

+        <vlan-list>

+          <vlan-id>1255.ae81</vlan-id>

+          <border-element-type>VDBE</border-element-type>

+          <border-element-tangibility>VIRTUAL</border-element-tangibility>

+          <port-id></port-id>

+          <border-element-id>ALPVDBE1</border-element-id>

+          <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>

+          <lag-id>ae81</lag-id>

+          <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>

+        </vlan-list>

+        <vlan-list>

+          <vlan-id>1995.ae81</vlan-id>

+          <border-element-type>ASBG</border-element-type>

+          <border-element-tangibility>VIRTUAL</border-element-tangibility>

+          <port-id></port-id>

+          <border-element-id>ALPASBG1</border-element-id>

+         <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>

+          <lag-id>ae81</lag-id>

+          <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>

+        </vlan-list>

+        <vlan-list>

+          <vlan-id>85.xe-10/0/2</vlan-id>

+          <border-element-type>BGF2</border-element-type>

+          <border-element-tangibility>PHYSICAL</border-element-tangibility>

+          <port-id>xe-10/0/2</port-id>

+          <border-element-id>ALPBGF2</border-element-id>

+          <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>

+          <lag-id></lag-id>

+          <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>

+        </vlan-list>

+        <vlan-list>

+          <vlan-id>85.xe-10/0/1</vlan-id>

+          <border-element-type>BGF1</border-element-type>

+          <border-element-tangibility>PHYSICAL</border-element-tangibility>

+          <port-id>xe-10/0/1</port-id>

+          <border-element-id>ALPBGF1</border-element-id>

+          <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>

+          <lag-id></lag-id>

+          <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>

+        </vlan-list>

+        <ipe-id>1</ipe-id>

+      </router-list>

+    </virtual-datacenter-list>

+    <virtual-datacenter-list>

+      <vdc-id>15001418</vdc-id>

+      <router-list>

+        <router-name>SANRTR1</router-name>

+        <ipe-loopback-address>2.1.1.1</ipe-loopback-address>

+        <vlan-list>

+          <vlan-id>1255.ae81</vlan-id>

+          <border-element-type>VDBE</border-element-type>

+          <border-element-tangibility>VIRTUAL</border-element-tangibility>

+          <port-id></port-id>

+          <border-element-id>SANVDBE1</border-element-id>

+          <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>

+          <lag-id>ae81</lag-id>

+          <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>

+        </vlan-list>

+        <vlan-list>

+          <vlan-id>1995.ae81</vlan-id>

+          <border-element-type>ASBG</border-element-type>

+          <border-element-tangibility>VIRTUAL</border-element-tangibility>

+          <port-id></port-id>

+          <border-element-id>SANASBG1</border-element-id>

+          <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>

+          <lag-id>ae81</lag-id>

+          <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>

+        </vlan-list>

+        <vlan-list>

+          <vlan-id>85.xe-10/0/2</vlan-id>

+          <border-element-type>BGF2</border-element-type>

+          <border-element-tangibility>PHYSICAL</border-element-tangibility>

+          <port-id>xe-10/0/2</port-id>

+          <border-element-id>SANBGF2</border-element-id>

+          <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>

+          <lag-id></lag-id>

+          <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>

+        </vlan-list>

+        <vlan-list>

+          <vlan-id>85.xe-10/0/1</vlan-id>

+          <border-element-type>BGF1</border-element-type>

+          <border-element-tangibility>PHYSICAL</border-element-tangibility>

+          <port-id>xe-10/0/1</port-id>

+          <border-element-id>SANBGF1</border-element-id>

+          <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>

+          <lag-id></lag-id>

+          <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>

+        </vlan-list>

+        <ipe-id>1</ipe-id>

+      </router-list>

+      <router-list>

+        <router-name>SANRTR2</router-name>

+        <ipe-loopback-address>2.1.1.2</ipe-loopback-address>

+        <vlan-list>

+          <vlan-id>1255.ae81</vlan-id>

+          <border-element-type>VDBE</border-element-type>

+          <border-element-tangibility>VIRTUAL</border-element-tangibility>

+          <port-id></port-id>

+          <border-element-id>SANVDBE1</border-element-id>

+          <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>

+          <lag-id>ae81</lag-id>

+          <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>

+        </vlan-list>

+        <vlan-list>

+          <vlan-id>1995.ae81</vlan-id>

+          <border-element-type>ASBG</border-element-type>

+          <border-element-tangibility>VIRTUAL</border-element-tangibility>

+          <port-id></port-id>

+          <border-element-id>SANASBG1</border-element-id>

+          <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>

+          <lag-id>ae81</lag-id>

+          <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>

+        </vlan-list>

+        <vlan-list>

+          <vlan-id>85.xe-10/0/2</vlan-id>

+          <border-element-type>BGF2</border-element-type>

+          <border-element-tangibility>PHYSICAL</border-element-tangibility>

+          <port-id>xe-10/0/2</port-id>

+          <border-element-id>SANBGF2</border-element-id>

+          <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>

+          <lag-id></lag-id>

+          <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>

+        </vlan-list>

+        <vlan-list>

+          <vlan-id>85.xe-10/0/1</vlan-id>

+          <border-element-type>BGF1</border-element-type>

+          <border-element-tangibility>PHYSICAL</border-element-tangibility>

+          <port-id>xe-10/0/1</port-id>

+          <border-element-id>SANBGF1</border-element-id>

+          <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>

+          <lag-id></lag-id>

+          <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>

+        </vlan-list>

+        <ipe-id>2</ipe-id>

+      </router-list>

+    </virtual-datacenter-list>

+    <service-type>COLLABORATE</service-type>

+    <interface-status>DISABLE</interface-status>

+    <customer-id>custid-888</customer-id>

+    <service-instance-id>SII-2016-10-22-001</service-instance-id>

+    <provision-type>CUSTOMER</provision-type>

+    <vni-id>100668</vni-id>

+  </nbnc-response-information>

+			</output>

+		</tag0:RequestData>

+	</sdncadapterworkflow:response-data>

 </sdncadapterworkflow:SDNCAdapterWorkflowResponse> 
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/sdncadaptercallbackrequest.xml b/bpmn/MSOCommonBPMN/src/test/resources/sdncadaptercallbackrequest.xml
index 89e4fef..754dc20 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/sdncadaptercallbackrequest.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/sdncadaptercallbackrequest.xml
@@ -1,342 +1,342 @@
-<SDNCAdapterCallbackRequest xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
-    <CallbackHeader>
-        <RequestId>2f7d1b38-2b78-4ef2-8ad6-1552d88620fa</RequestId>
-        <ResponseCode>200</ResponseCode>
-        <ResponseMessage>OK</ResponseMessage>
-    </CallbackHeader>
-    <RequestData xsi:type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">				&lt;layer3-service-list xmlns="com:att:sdnctl:l3api"&gt;
-					&lt;service-instance-id&gt;FK/VLXM/003717//SW_INTERNET&lt;/service-instance-id&gt;
-					&lt;service-status&gt;
-						&lt;rpc-name&gt;service-configuration-operation&lt;/rpc-name&gt;
-						&lt;rpc-action&gt;activate&lt;/rpc-action&gt;
-						&lt;request-status&gt;synccomplete&lt;/request-status&gt;
-						&lt;final-indicator&gt;N&lt;/final-indicator&gt;
-						&lt;l3sdn-action&gt;Layer3ServiceActivateRequest&lt;/l3sdn-action&gt;
-						&lt;l3sdn-subaction&gt;SUPP&lt;/l3sdn-subaction&gt;
-						&lt;response-timestamp&gt;2015-04-28T21:32:11.386Z&lt;/response-timestamp&gt;
-					&lt;/service-status&gt;
-					&lt;service-data&gt;
-						&lt;internet-evc-access-information&gt;
-							&lt;ip-version&gt;ds&lt;/ip-version&gt;
-							&lt;internet-evc-speed-value&gt;8&lt;/internet-evc-speed-value&gt;
-							&lt;internet-evc-speed-units&gt;Mbps&lt;/internet-evc-speed-units&gt;
-						&lt;/internet-evc-access-information&gt;
-						&lt;vr-lan xmlns="com:att:sdnctl:l3api"&gt;
-							&lt;vr-lan-interface&gt;
-								&lt;static-routes&gt;
-									&lt;v6-static-routes&gt;
-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
-										&lt;v6-static-route-prefix&gt;2001:1890:12e3:2da::&lt;/v6-static-route-prefix&gt;
-										&lt;v6-static-route-prefix-length&gt;28&lt;/v6-static-route-prefix-length&gt;
-									&lt;/v6-static-routes&gt;
-									&lt;v4-static-routes&gt;
-										&lt;v4-static-route-prefix&gt;255.255.252.1&lt;/v4-static-route-prefix&gt;
-										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;
-										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;
-									&lt;/v4-static-routes&gt;
-									&lt;v6-static-routes&gt;
-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
-										&lt;v6-static-route-prefix&gt;2001:1890:12e3:2da::&lt;/v6-static-route-prefix&gt;
-										&lt;v6-static-route-prefix-length&gt;28&lt;/v6-static-route-prefix-length&gt;
-									&lt;/v6-static-routes&gt;
-									&lt;v4-static-routes&gt;
-										&lt;v4-static-route-prefix&gt;255.255.252.2&lt;/v4-static-route-prefix&gt;
-										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;
-										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;
-									&lt;/v4-static-routes&gt;
-									&lt;v4-static-routes&gt;
-										&lt;v4-static-route-prefix&gt;255.255.252.3&lt;/v4-static-route-prefix&gt;
-										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;
-										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;
-									&lt;/v4-static-routes&gt;
-								&lt;/static-routes&gt;
-								&lt;dhcp&gt;
-									&lt;v6-dhcp-server-enabled&gt;N&lt;/v6-dhcp-server-enabled&gt;
-									&lt;v4-dhcp-server-enabled&gt;Y&lt;/v4-dhcp-server-enabled&gt;
-									&lt;use-v6-default-pool&gt;N&lt;/use-v6-default-pool&gt;
-									&lt;excluded-v4-dhcp-addresses-from-default-pool&gt;
-									  &lt;excluded-v4-address&gt;192.168.1.7&lt;/excluded-v4-address&gt;
-									&lt;/excluded-v4-dhcp-addresses-from-default-pool&gt;
-									&lt;excluded-v4-dhcp-addresses-from-default-pool&gt;
-									  &lt;excluded-v4-address&gt;192.168.1.8&lt;/excluded-v4-address&gt;
-									&lt;/excluded-v4-dhcp-addresses-from-default-pool&gt;
-									&lt;v4-dhcp-pools&gt;
-										&lt;v4-dhcp-relay-next-hop-address&gt;1.1.1.1&lt;/v4-dhcp-relay-next-hop-address&gt;
-										&lt;v4-dhcp-pool-prefix-length&gt;28&lt;/v4-dhcp-pool-prefix-length&gt;
-										&lt;excluded-v4-addresses&gt;
-											&lt;excluded-v4-address&gt;192.168.1.5&lt;/excluded-v4-address&gt;
-										&lt;/excluded-v4-addresses&gt;
-										&lt;v4-dhcp-relay-gateway-address&gt;2.2.2.1&lt;/v4-dhcp-relay-gateway-address&gt;
-										&lt;excluded-v4-addresses&gt;
-											&lt;excluded-v4-address&gt;192.168.1.6&lt;/excluded-v4-address&gt;
-										&lt;/excluded-v4-addresses&gt;
-										&lt;v4-dhcp-pool-prefix&gt;192.155.2.3&lt;/v4-dhcp-pool-prefix&gt;
-									&lt;/v4-dhcp-pools&gt;
-									&lt;v4-dhcp-pools&gt;
-										&lt;v4-dhcp-relay-next-hop-address&gt;1.1.1.2&lt;/v4-dhcp-relay-next-hop-address&gt;
-										&lt;v4-dhcp-pool-prefix-length&gt;28&lt;/v4-dhcp-pool-prefix-length&gt;
-										&lt;excluded-v4-addresses&gt;
-											&lt;excluded-v4-address&gt;192.168.1.6&lt;/excluded-v4-address&gt;
-										&lt;/excluded-v4-addresses&gt;
-										&lt;v4-dhcp-relay-gateway-address&gt;2.2.2.2&lt;/v4-dhcp-relay-gateway-address&gt;
-										&lt;excluded-v4-addresses&gt;
-											&lt;excluded-v4-address&gt;192.168.1.7&lt;/excluded-v4-address&gt;
-										&lt;/excluded-v4-addresses&gt;
-										&lt;v4-dhcp-pool-prefix&gt;192.155.2.4&lt;/v4-dhcp-pool-prefix&gt;
-									&lt;/v4-dhcp-pools&gt;									
-									&lt;use-v4-default-pool&gt;Y&lt;/use-v4-default-pool&gt;
-									&lt;excluded-v6-dhcp-addresses-from-default-pool&gt;
-									  &lt;excluded-v6-address&gt;1:5&lt;/excluded-v6-address&gt;
-									&lt;/excluded-v6-dhcp-addresses-from-default-pool&gt;
-									&lt;excluded-v6-dhcp-addresses-from-default-pool&gt;
-									  &lt;excluded-v6-address&gt;1:6&lt;/excluded-v6-address&gt;
-									&lt;/excluded-v6-dhcp-addresses-from-default-pool&gt;
-									&lt;v6-dhcp-pools&gt;
-										&lt;v6-dhcp-relay-next-hop-address&gt;4:4&lt;/v6-dhcp-relay-next-hop-address&gt;
-										&lt;v6-dhcp-pool-prefix-length&gt;28&lt;/v6-dhcp-pool-prefix-length&gt;
-										&lt;excluded-v6-addresses&gt;
-											&lt;excluded-v6-address&gt;1:1&lt;/excluded-v6-address&gt;
-										&lt;/excluded-v6-addresses&gt;
-										&lt;v6-dhcp-relay-gateway-address&gt;3:3&lt;/v6-dhcp-relay-gateway-address&gt;
-										&lt;excluded-v6-addresses&gt;
-											&lt;excluded-v6-address&gt;2:2&lt;/excluded-v6-address&gt;
-										&lt;/excluded-v6-addresses&gt;
-										&lt;v6-dhcp-pool-prefix&gt;0:0&lt;/v6-dhcp-pool-prefix&gt;
-									&lt;/v6-dhcp-pools&gt;
-									&lt;v6-dhcp-pools&gt;
-										&lt;v6-dhcp-relay-next-hop-address&gt;4:4&lt;/v6-dhcp-relay-next-hop-address&gt;
-										&lt;v6-dhcp-pool-prefix-length&gt;28&lt;/v6-dhcp-pool-prefix-length&gt;
-										&lt;excluded-v6-addresses&gt;
-											&lt;excluded-v6-address&gt;1:1&lt;/excluded-v6-address&gt;
-										&lt;/excluded-v6-addresses&gt;
-										&lt;v6-dhcp-relay-gateway-address&gt;3:3&lt;/v6-dhcp-relay-gateway-address&gt;
-										&lt;excluded-v6-addresses&gt;
-											&lt;excluded-v6-address&gt;2:2&lt;/excluded-v6-address&gt;
-										&lt;/excluded-v6-addresses&gt;
-										&lt;v6-dhcp-pool-prefix&gt;0:0&lt;/v6-dhcp-pool-prefix&gt;
-									&lt;/v6-dhcp-pools&gt;									
-								&lt;/dhcp&gt;
-								&lt;firewall-lite&gt;
-									&lt;stateful-firewall-lite-v6-enabled&gt;N&lt;/stateful-firewall-lite-v6-enabled&gt;
-									&lt;stateful-firewall-lite-v4-enabled&gt;Y&lt;/stateful-firewall-lite-v4-enabled&gt;
-									&lt;v4-firewall-packet-filters&gt;
-									  &lt;v4-firewall-prefix&gt;0.0.0.1&lt;/v4-firewall-prefix&gt;
-									  &lt;v4-firewall-prefix-length&gt;1&lt;/v4-firewall-prefix-length&gt;
-									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;
-									  &lt;udp-ports&gt;
-									    &lt;port-number&gt;1&lt;/port-number&gt;
-									  &lt;/udp-ports&gt;
-									  &lt;tcp-ports&gt;
-									    &lt;port-number&gt;1&lt;/port-number&gt;
-									  &lt;/tcp-ports&gt;
-									&lt;/v4-firewall-packet-filters&gt;
-									&lt;v4-firewall-packet-filters&gt;
-									  &lt;v4-firewall-prefix&gt;0.0.0.2&lt;/v4-firewall-prefix&gt;
-									  &lt;v4-firewall-prefix-length&gt;2&lt;/v4-firewall-prefix-length&gt;
-									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;
-									  &lt;udp-ports&gt;
-									    &lt;port-number&gt;2&lt;/port-number&gt;
-									  &lt;/udp-ports&gt;
-									  &lt;tcp-ports&gt;
-									    &lt;port-number&gt;2&lt;/port-number&gt;
-									  &lt;/tcp-ports&gt;
-									&lt;/v4-firewall-packet-filters&gt;
-									&lt;v6-firewall-packet-filters&gt;
-									  &lt;v6-firewall-prefix&gt;:&lt;/v6-firewall-prefix&gt;
-									  &lt;v6-firewall-prefix-length&gt;0&lt;/v6-firewall-prefix-length&gt;
-									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;
-									  &lt;udp-ports&gt;
-									    &lt;port-number&gt;3&lt;/port-number&gt;
-									  &lt;/udp-ports&gt;
-									  &lt;tcp-ports&gt;
-									    &lt;port-number&gt;3&lt;/port-number&gt;
-									  &lt;/tcp-ports&gt;
-									&lt;/v6-firewall-packet-filters&gt;
-									&lt;v6-firewall-packet-filters&gt;
-									  &lt;v6-firewall-prefix&gt;:&lt;/v6-firewall-prefix&gt;
-									  &lt;v6-firewall-prefix-length&gt;1&lt;/v6-firewall-prefix-length&gt;
-									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;
-									  &lt;udp-ports&gt;
-									    &lt;port-number&gt;4&lt;/port-number&gt;
-									  &lt;/udp-ports&gt;
-									  &lt;tcp-ports&gt;
-									    &lt;port-number&gt;4&lt;/port-number&gt;
-									  &lt;/tcp-ports&gt;
-									&lt;/v6-firewall-packet-filters&gt;
-								&lt;/firewall-lite&gt;
-								&lt;pat&gt;
-									&lt;v4-pat-pools&gt;
-										&lt;v4-pat-pool-prefix&gt;192.168.1.44&lt;/v4-pat-pool-prefix&gt;
-										&lt;v4-pat-pool-next-hop-address&gt;192.168.1.5&lt;/v4-pat-pool-next-hop-address&gt;
-										&lt;v4-pat-pool-prefix-length&gt;0&lt;/v4-pat-pool-prefix-length&gt;
-									&lt;/v4-pat-pools&gt;
-									&lt;use-v4-default-pool&gt;Y&lt;/use-v4-default-pool&gt;
-									&lt;v4-pat-enabled&gt;N&lt;/v4-pat-enabled&gt;
-									&lt;v4-pat-pools&gt;
-										&lt;v4-pat-pool-prefix&gt;192.168.1.45&lt;/v4-pat-pool-prefix&gt;
-										&lt;v4-pat-pool-next-hop-address&gt;192.168.1.6&lt;/v4-pat-pool-next-hop-address&gt;
-										&lt;v4-pat-pool-prefix-length&gt;28&lt;/v4-pat-pool-prefix-length&gt;
-									&lt;/v4-pat-pools&gt;
-								&lt;/pat&gt;
-								&lt;nat&gt;
-								  &lt;v4-nat-enabled&gt;Y&lt;/v4-nat-enabled&gt;
-								  &lt;v4-nat-mapping-entries&gt;
-								    &lt;v4-nat-internal&gt;0.0.0.0&lt;/v4-nat-internal&gt;
-								    &lt;v4-nat-next-hop-address&gt;0.0.0.0&lt;/v4-nat-next-hop-address&gt;
-								    &lt;v4-nat-external&gt;0.0.0.0&lt;/v4-nat-external&gt;
-								  &lt;/v4-nat-mapping-entries&gt;
-								  &lt;v4-nat-mapping-entries&gt;
-								    &lt;v4-nat-internal&gt;0.0.0.1&lt;/v4-nat-internal&gt;
-								    &lt;v4-nat-next-hop-address&gt;0.0.0.1&lt;/v4-nat-next-hop-address&gt;
-								    &lt;v4-nat-external&gt;0.0.0.1&lt;/v4-nat-external&gt;
-								  &lt;/v4-nat-mapping-entries&gt;
-								&lt;/nat&gt;
-								&lt;vr-designation&gt;primary&lt;/vr-designation&gt;
-								&lt;v4-vce-loopback-address&gt;162.200.3.144&lt;/v4-vce-loopback-address&gt;
-								&lt;v6-vr-lan-prefix-length&gt;64&lt;/v6-vr-lan-prefix-length&gt;
-								&lt;v6-vce-wan-address&gt;2001:1890:12e3:2da::&lt;/v6-vce-wan-address&gt;
-								&lt;v6-vr-lan-prefix&gt;2620:0:10d0:f:ffff:ffff:ffff:fffe&lt;/v6-vr-lan-prefix&gt;
-								&lt;v4-vr-lan-prefix-length&gt;24&lt;/v4-vr-lan-prefix-length&gt;
-								&lt;v4-vr-lan-prefix&gt;10.192.27.254&lt;/v4-vr-lan-prefix&gt;
-								&lt;v4-public-lan-prefixes&gt;
-									&lt;t-provided-v4-lan-public-prefixes&gt;
-										&lt;request-index&gt;1&lt;/request-index&gt;
-										&lt;v4-next-hop-address&gt;192.168.1.2&lt;/v4-next-hop-address&gt;
-										&lt;v4-lan-public-prefix&gt;192.168.1.1&lt;/v4-lan-public-prefix&gt;
-										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
-									&lt;/t-provided-v4-lan-public-prefixes&gt;
-									&lt;t-provided-v4-lan-public-prefixes&gt;
-										&lt;request-index&gt;1&lt;/request-index&gt;
-										&lt;v4-next-hop-address&gt;192.168.1.72&lt;/v4-next-hop-address&gt;
-										&lt;v4-lan-public-prefix&gt;192.168.1.71&lt;/v4-lan-public-prefix&gt;
-										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
-									&lt;/t-provided-v4-lan-public-prefixes&gt;
-									&lt;t-provided-v4-lan-public-prefixes&gt;
-										&lt;request-index&gt;1&lt;/request-index&gt;
-										&lt;v4-next-hop-address&gt;192.168.1.68&lt;/v4-next-hop-address&gt;
-										&lt;v4-lan-public-prefix&gt;192.168.1.67&lt;/v4-lan-public-prefix&gt;
-										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
-									&lt;/t-provided-v4-lan-public-prefixes&gt;
-								&lt;/v4-public-lan-prefixes&gt;
-								&lt;v6-public-lan-prefixes&gt;
-									&lt;t-provided-v6-lan-public-prefixes&gt;
-										&lt;request-index&gt;1&lt;/request-index&gt;
-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
-										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;
-										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
-									&lt;/t-provided-v6-lan-public-prefixes&gt;
-									&lt;t-provided-v6-lan-public-prefixes&gt;
-										&lt;request-index&gt;1&lt;/request-index&gt;
-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
-										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:3da::&lt;/v6-lan-public-prefix&gt;
-										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
-									&lt;/t-provided-v6-lan-public-prefixes&gt;
-									&lt;t-provided-v6-lan-public-prefixes&gt;
-										&lt;request-index&gt;1&lt;/request-index&gt;
-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
-										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:4da::&lt;/v6-lan-public-prefix&gt;
-										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
-									&lt;/t-provided-v6-lan-public-prefixes&gt;
-								&lt;/v6-public-lan-prefixes&gt;
-							&lt;/vr-lan-interface&gt;
-							&lt;routing-protocol&gt;none&lt;/routing-protocol&gt;
-						&lt;/vr-lan&gt;
-&lt;ucpe-vms-service-information&gt;				
- &lt;transport-service-information&gt;
-    &lt;transport-service-type&gt;AVPN&lt;/transport-service-type&gt;
-	&lt;access-circuit-info&gt;
-	   &lt;access-circuit-id&gt;1&lt;/access-circuit-id&gt;
-	   &lt;dual-mode&gt;Active&lt;/dual-mode&gt;
-	&lt;/access-circuit-info&gt;
-	&lt;access-circuit-info&gt;
-	   &lt;access-circuit-id&gt;2&lt;/access-circuit-id&gt;
-	   &lt;dual-mode&gt;Standby&lt;/dual-mode&gt;
-	&lt;/access-circuit-info&gt;	
- &lt;/transport-service-information&gt;
- &lt;ucpe-information&gt;
-    &lt;ucpe-host-name&gt;hostname&lt;/ucpe-host-name&gt;
-    &lt;ucpe-activation-code&gt;activecode&lt;/ucpe-activation-code&gt;
-    &lt;out-of-band-management-modem&gt;OOB&lt;/out-of-band-management-modem&gt;
-  &lt;/ucpe-information&gt;
-  &lt;vnf-list&gt;
-	&lt;vnf-information&gt; 
-		&lt;vnf-instance-id&gt;1&lt;/vnf-instance-id&gt; 
-		&lt;vnf-sequence-number&gt;1&lt;/vnf-sequence-number&gt;
-		&lt;vnf-type&gt;ZZ&lt;/vnf-type&gt;
-		&lt;vnf-vendor&gt;JUNIPER&lt;/vnf-vendor&gt;
-		&lt;vnf-model&gt;MODEL1&lt;/vnf-model&gt;
-		&lt;vnf-id&gt;1&lt;/vnf-id&gt;
-		&lt;prov-status&gt;1&lt;/prov-status&gt;
-		&lt;operational-state&gt;1&lt;/operational-state&gt;
-		&lt;orchestration-status&gt;1&lt;/orchestration-status&gt;
-		&lt;equipment-role&gt;1&lt;/equipment-role&gt;
-    &lt;/vnf-information&gt;
-	&lt;vnf-information&gt; 
-		&lt;vnf-instance-id&gt;2&lt;/vnf-instance-id&gt; 
-		&lt;vnf-sequence-number&gt;2&lt;/vnf-sequence-number&gt;
-		&lt;vnf-type&gt;HY&lt;/vnf-type&gt;
-		&lt;vnf-vendor&gt;JUNIPER&lt;/vnf-vendor&gt;
-		&lt;vnf-model&gt;MODEL2&lt;/vnf-model&gt;
-		&lt;vnf-id&gt;2&lt;/vnf-id&gt;
-		&lt;prov-status&gt;2&lt;/prov-status&gt;
-		&lt;operational-state&gt;2&lt;/operational-state&gt;
-		&lt;orchestration-status&gt;2&lt;/orchestration-status&gt;
-		&lt;equipment-role&gt;2&lt;/equipment-role&gt;
-    &lt;/vnf-information&gt;					
-  &lt;/vnf-list&gt;
- &lt;/ucpe-vms-service-information&gt;										
-						&lt;request-information&gt;
-							&lt;request-action&gt;Layer3ServiceActivateRequest&lt;/request-action&gt;
-							&lt;order-number&gt;4281555&lt;/order-number&gt;
-							&lt;request-id&gt;155415ab-b4a7-4382-b4c6-d17d9sm42855&lt;/request-id&gt;
-							&lt;notification-url&gt;https://csi-tst-q22.it.att.com:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws&lt;/notification-url&gt;
-							&lt;source&gt;OMX&lt;/source&gt;
-							&lt;order-version&gt;1&lt;/order-version&gt;
-						&lt;/request-information&gt;
-						&lt;sdnc-request-header&gt;
-							&lt;svc-action&gt;activate&lt;/svc-action&gt;
-							&lt;svc-notification-url&gt;https://msojra.mtsnjdcp1.aic.cip.att.com:8443/adapters/rest/SDNCNotify&lt;/svc-notification-url&gt;
-							&lt;svc-request-id&gt;5b1f3c5d-cdf9-488d-8a4b-d3f1229d7760&lt;/svc-request-id&gt;
-						&lt;/sdnc-request-header&gt;
-						&lt;l2-homing-information&gt;
-							&lt;topology&gt;MultiPoint&lt;/topology&gt;
-							&lt;preferred-aic-clli&gt;MTSNJA4LCP1&lt;/preferred-aic-clli&gt;
-							&lt;evc-name&gt;AS/VLXM/003717//SW&lt;/evc-name&gt;
-						&lt;/l2-homing-information&gt;
-						&lt;service-information&gt;
-							&lt;service-instance-id&gt;FK/VLXM/003717//SW_INTERNET&lt;/service-instance-id&gt;
-							&lt;subscriber-name&gt;FOUR SEASONS HEATING &amp; COOLING_8310006378683&lt;/subscriber-name&gt;
-							&lt;service-type&gt;SDN-ETHERNET-INTERNET&lt;/service-type&gt;
-						&lt;/service-information&gt;
-						&lt;internet-service-change-details&gt;
-							&lt;internet-evc-speed-value&gt;10&lt;/internet-evc-speed-value&gt;
-							&lt;internet-evc-speed-units&gt;Kbps&lt;/internet-evc-speed-units&gt;
-							&lt;t-provided-v4-lan-public-prefixes&gt;
-							   &lt;request-index&gt;1&lt;/request-index&gt;
-							   &lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;
-							   &lt;v4-lan-public-prefix&gt;192.168.1.15&lt;/v4-lan-public-prefix&gt;
-							   &lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
-							&lt;/t-provided-v4-lan-public-prefixes&gt;
-							&lt;t-provided-v4-lan-public-prefixes&gt;
-							   &lt;request-index&gt;2&lt;/request-index&gt;
-							   &lt;v4-next-hop-address&gt;192.168.1.16&lt;/v4-next-hop-address&gt;
-							   &lt;v4-lan-public-prefix&gt;192.168.1.16&lt;/v4-lan-public-prefix&gt;
-							   &lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
-							&lt;/t-provided-v4-lan-public-prefixes&gt;
-							&lt;t-provided-v6-lan-public-prefixes&gt;
-							   &lt;request-index&gt;1&lt;/request-index&gt;
-							   &lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
-							   &lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;
-							   &lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
-							&lt;/t-provided-v6-lan-public-prefixes&gt;
-							&lt;t-provided-v6-lan-public-prefixes&gt;
-							   &lt;request-index&gt;1&lt;/request-index&gt;
-							   &lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
-							   &lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;
-							   &lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
-							&lt;/t-provided-v6-lan-public-prefixes&gt;
-						&lt;/internet-service-change-details&gt;
-					&lt;/service-data&gt;
-				&lt;/layer3-service-list&gt;
-</RequestData>
-</SDNCAdapterCallbackRequest>
+<SDNCAdapterCallbackRequest xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

+    <CallbackHeader>

+        <RequestId>2f7d1b38-2b78-4ef2-8ad6-1552d88620fa</RequestId>

+        <ResponseCode>200</ResponseCode>

+        <ResponseMessage>OK</ResponseMessage>

+    </CallbackHeader>

+    <RequestData xsi:type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">				&lt;layer3-service-list xmlns="com:att:sdnctl:l3api"&gt;

+					&lt;service-instance-id&gt;FK/VLXM/003717//SW_INTERNET&lt;/service-instance-id&gt;

+					&lt;service-status&gt;

+						&lt;rpc-name&gt;service-configuration-operation&lt;/rpc-name&gt;

+						&lt;rpc-action&gt;activate&lt;/rpc-action&gt;

+						&lt;request-status&gt;synccomplete&lt;/request-status&gt;

+						&lt;final-indicator&gt;N&lt;/final-indicator&gt;

+						&lt;l3sdn-action&gt;Layer3ServiceActivateRequest&lt;/l3sdn-action&gt;

+						&lt;l3sdn-subaction&gt;SUPP&lt;/l3sdn-subaction&gt;

+						&lt;response-timestamp&gt;2015-04-28T21:32:11.386Z&lt;/response-timestamp&gt;

+					&lt;/service-status&gt;

+					&lt;service-data&gt;

+						&lt;internet-evc-access-information&gt;

+							&lt;ip-version&gt;ds&lt;/ip-version&gt;

+							&lt;internet-evc-speed-value&gt;8&lt;/internet-evc-speed-value&gt;

+							&lt;internet-evc-speed-units&gt;Mbps&lt;/internet-evc-speed-units&gt;

+						&lt;/internet-evc-access-information&gt;

+						&lt;vr-lan xmlns="com:att:sdnctl:l3api"&gt;

+							&lt;vr-lan-interface&gt;

+								&lt;static-routes&gt;

+									&lt;v6-static-routes&gt;

+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

+										&lt;v6-static-route-prefix&gt;2001:1890:12e3:2da::&lt;/v6-static-route-prefix&gt;

+										&lt;v6-static-route-prefix-length&gt;28&lt;/v6-static-route-prefix-length&gt;

+									&lt;/v6-static-routes&gt;

+									&lt;v4-static-routes&gt;

+										&lt;v4-static-route-prefix&gt;255.255.252.1&lt;/v4-static-route-prefix&gt;

+										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;

+										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;

+									&lt;/v4-static-routes&gt;

+									&lt;v6-static-routes&gt;

+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

+										&lt;v6-static-route-prefix&gt;2001:1890:12e3:2da::&lt;/v6-static-route-prefix&gt;

+										&lt;v6-static-route-prefix-length&gt;28&lt;/v6-static-route-prefix-length&gt;

+									&lt;/v6-static-routes&gt;

+									&lt;v4-static-routes&gt;

+										&lt;v4-static-route-prefix&gt;255.255.252.2&lt;/v4-static-route-prefix&gt;

+										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;

+										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;

+									&lt;/v4-static-routes&gt;

+									&lt;v4-static-routes&gt;

+										&lt;v4-static-route-prefix&gt;255.255.252.3&lt;/v4-static-route-prefix&gt;

+										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;

+										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;

+									&lt;/v4-static-routes&gt;

+								&lt;/static-routes&gt;

+								&lt;dhcp&gt;

+									&lt;v6-dhcp-server-enabled&gt;N&lt;/v6-dhcp-server-enabled&gt;

+									&lt;v4-dhcp-server-enabled&gt;Y&lt;/v4-dhcp-server-enabled&gt;

+									&lt;use-v6-default-pool&gt;N&lt;/use-v6-default-pool&gt;

+									&lt;excluded-v4-dhcp-addresses-from-default-pool&gt;

+									  &lt;excluded-v4-address&gt;192.168.1.7&lt;/excluded-v4-address&gt;

+									&lt;/excluded-v4-dhcp-addresses-from-default-pool&gt;

+									&lt;excluded-v4-dhcp-addresses-from-default-pool&gt;

+									  &lt;excluded-v4-address&gt;192.168.1.8&lt;/excluded-v4-address&gt;

+									&lt;/excluded-v4-dhcp-addresses-from-default-pool&gt;

+									&lt;v4-dhcp-pools&gt;

+										&lt;v4-dhcp-relay-next-hop-address&gt;1.1.1.1&lt;/v4-dhcp-relay-next-hop-address&gt;

+										&lt;v4-dhcp-pool-prefix-length&gt;28&lt;/v4-dhcp-pool-prefix-length&gt;

+										&lt;excluded-v4-addresses&gt;

+											&lt;excluded-v4-address&gt;192.168.1.5&lt;/excluded-v4-address&gt;

+										&lt;/excluded-v4-addresses&gt;

+										&lt;v4-dhcp-relay-gateway-address&gt;2.2.2.1&lt;/v4-dhcp-relay-gateway-address&gt;

+										&lt;excluded-v4-addresses&gt;

+											&lt;excluded-v4-address&gt;192.168.1.6&lt;/excluded-v4-address&gt;

+										&lt;/excluded-v4-addresses&gt;

+										&lt;v4-dhcp-pool-prefix&gt;192.155.2.3&lt;/v4-dhcp-pool-prefix&gt;

+									&lt;/v4-dhcp-pools&gt;

+									&lt;v4-dhcp-pools&gt;

+										&lt;v4-dhcp-relay-next-hop-address&gt;1.1.1.2&lt;/v4-dhcp-relay-next-hop-address&gt;

+										&lt;v4-dhcp-pool-prefix-length&gt;28&lt;/v4-dhcp-pool-prefix-length&gt;

+										&lt;excluded-v4-addresses&gt;

+											&lt;excluded-v4-address&gt;192.168.1.6&lt;/excluded-v4-address&gt;

+										&lt;/excluded-v4-addresses&gt;

+										&lt;v4-dhcp-relay-gateway-address&gt;2.2.2.2&lt;/v4-dhcp-relay-gateway-address&gt;

+										&lt;excluded-v4-addresses&gt;

+											&lt;excluded-v4-address&gt;192.168.1.7&lt;/excluded-v4-address&gt;

+										&lt;/excluded-v4-addresses&gt;

+										&lt;v4-dhcp-pool-prefix&gt;192.155.2.4&lt;/v4-dhcp-pool-prefix&gt;

+									&lt;/v4-dhcp-pools&gt;									

+									&lt;use-v4-default-pool&gt;Y&lt;/use-v4-default-pool&gt;

+									&lt;excluded-v6-dhcp-addresses-from-default-pool&gt;

+									  &lt;excluded-v6-address&gt;1:5&lt;/excluded-v6-address&gt;

+									&lt;/excluded-v6-dhcp-addresses-from-default-pool&gt;

+									&lt;excluded-v6-dhcp-addresses-from-default-pool&gt;

+									  &lt;excluded-v6-address&gt;1:6&lt;/excluded-v6-address&gt;

+									&lt;/excluded-v6-dhcp-addresses-from-default-pool&gt;

+									&lt;v6-dhcp-pools&gt;

+										&lt;v6-dhcp-relay-next-hop-address&gt;4:4&lt;/v6-dhcp-relay-next-hop-address&gt;

+										&lt;v6-dhcp-pool-prefix-length&gt;28&lt;/v6-dhcp-pool-prefix-length&gt;

+										&lt;excluded-v6-addresses&gt;

+											&lt;excluded-v6-address&gt;1:1&lt;/excluded-v6-address&gt;

+										&lt;/excluded-v6-addresses&gt;

+										&lt;v6-dhcp-relay-gateway-address&gt;3:3&lt;/v6-dhcp-relay-gateway-address&gt;

+										&lt;excluded-v6-addresses&gt;

+											&lt;excluded-v6-address&gt;2:2&lt;/excluded-v6-address&gt;

+										&lt;/excluded-v6-addresses&gt;

+										&lt;v6-dhcp-pool-prefix&gt;0:0&lt;/v6-dhcp-pool-prefix&gt;

+									&lt;/v6-dhcp-pools&gt;

+									&lt;v6-dhcp-pools&gt;

+										&lt;v6-dhcp-relay-next-hop-address&gt;4:4&lt;/v6-dhcp-relay-next-hop-address&gt;

+										&lt;v6-dhcp-pool-prefix-length&gt;28&lt;/v6-dhcp-pool-prefix-length&gt;

+										&lt;excluded-v6-addresses&gt;

+											&lt;excluded-v6-address&gt;1:1&lt;/excluded-v6-address&gt;

+										&lt;/excluded-v6-addresses&gt;

+										&lt;v6-dhcp-relay-gateway-address&gt;3:3&lt;/v6-dhcp-relay-gateway-address&gt;

+										&lt;excluded-v6-addresses&gt;

+											&lt;excluded-v6-address&gt;2:2&lt;/excluded-v6-address&gt;

+										&lt;/excluded-v6-addresses&gt;

+										&lt;v6-dhcp-pool-prefix&gt;0:0&lt;/v6-dhcp-pool-prefix&gt;

+									&lt;/v6-dhcp-pools&gt;									

+								&lt;/dhcp&gt;

+								&lt;firewall-lite&gt;

+									&lt;stateful-firewall-lite-v6-enabled&gt;N&lt;/stateful-firewall-lite-v6-enabled&gt;

+									&lt;stateful-firewall-lite-v4-enabled&gt;Y&lt;/stateful-firewall-lite-v4-enabled&gt;

+									&lt;v4-firewall-packet-filters&gt;

+									  &lt;v4-firewall-prefix&gt;0.0.0.1&lt;/v4-firewall-prefix&gt;

+									  &lt;v4-firewall-prefix-length&gt;1&lt;/v4-firewall-prefix-length&gt;

+									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;

+									  &lt;udp-ports&gt;

+									    &lt;port-number&gt;1&lt;/port-number&gt;

+									  &lt;/udp-ports&gt;

+									  &lt;tcp-ports&gt;

+									    &lt;port-number&gt;1&lt;/port-number&gt;

+									  &lt;/tcp-ports&gt;

+									&lt;/v4-firewall-packet-filters&gt;

+									&lt;v4-firewall-packet-filters&gt;

+									  &lt;v4-firewall-prefix&gt;0.0.0.2&lt;/v4-firewall-prefix&gt;

+									  &lt;v4-firewall-prefix-length&gt;2&lt;/v4-firewall-prefix-length&gt;

+									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;

+									  &lt;udp-ports&gt;

+									    &lt;port-number&gt;2&lt;/port-number&gt;

+									  &lt;/udp-ports&gt;

+									  &lt;tcp-ports&gt;

+									    &lt;port-number&gt;2&lt;/port-number&gt;

+									  &lt;/tcp-ports&gt;

+									&lt;/v4-firewall-packet-filters&gt;

+									&lt;v6-firewall-packet-filters&gt;

+									  &lt;v6-firewall-prefix&gt;:&lt;/v6-firewall-prefix&gt;

+									  &lt;v6-firewall-prefix-length&gt;0&lt;/v6-firewall-prefix-length&gt;

+									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;

+									  &lt;udp-ports&gt;

+									    &lt;port-number&gt;3&lt;/port-number&gt;

+									  &lt;/udp-ports&gt;

+									  &lt;tcp-ports&gt;

+									    &lt;port-number&gt;3&lt;/port-number&gt;

+									  &lt;/tcp-ports&gt;

+									&lt;/v6-firewall-packet-filters&gt;

+									&lt;v6-firewall-packet-filters&gt;

+									  &lt;v6-firewall-prefix&gt;:&lt;/v6-firewall-prefix&gt;

+									  &lt;v6-firewall-prefix-length&gt;1&lt;/v6-firewall-prefix-length&gt;

+									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;

+									  &lt;udp-ports&gt;

+									    &lt;port-number&gt;4&lt;/port-number&gt;

+									  &lt;/udp-ports&gt;

+									  &lt;tcp-ports&gt;

+									    &lt;port-number&gt;4&lt;/port-number&gt;

+									  &lt;/tcp-ports&gt;

+									&lt;/v6-firewall-packet-filters&gt;

+								&lt;/firewall-lite&gt;

+								&lt;pat&gt;

+									&lt;v4-pat-pools&gt;

+										&lt;v4-pat-pool-prefix&gt;192.168.1.44&lt;/v4-pat-pool-prefix&gt;

+										&lt;v4-pat-pool-next-hop-address&gt;192.168.1.5&lt;/v4-pat-pool-next-hop-address&gt;

+										&lt;v4-pat-pool-prefix-length&gt;0&lt;/v4-pat-pool-prefix-length&gt;

+									&lt;/v4-pat-pools&gt;

+									&lt;use-v4-default-pool&gt;Y&lt;/use-v4-default-pool&gt;

+									&lt;v4-pat-enabled&gt;N&lt;/v4-pat-enabled&gt;

+									&lt;v4-pat-pools&gt;

+										&lt;v4-pat-pool-prefix&gt;192.168.1.45&lt;/v4-pat-pool-prefix&gt;

+										&lt;v4-pat-pool-next-hop-address&gt;192.168.1.6&lt;/v4-pat-pool-next-hop-address&gt;

+										&lt;v4-pat-pool-prefix-length&gt;28&lt;/v4-pat-pool-prefix-length&gt;

+									&lt;/v4-pat-pools&gt;

+								&lt;/pat&gt;

+								&lt;nat&gt;

+								  &lt;v4-nat-enabled&gt;Y&lt;/v4-nat-enabled&gt;

+								  &lt;v4-nat-mapping-entries&gt;

+								    &lt;v4-nat-internal&gt;0.0.0.0&lt;/v4-nat-internal&gt;

+								    &lt;v4-nat-next-hop-address&gt;0.0.0.0&lt;/v4-nat-next-hop-address&gt;

+								    &lt;v4-nat-external&gt;0.0.0.0&lt;/v4-nat-external&gt;

+								  &lt;/v4-nat-mapping-entries&gt;

+								  &lt;v4-nat-mapping-entries&gt;

+								    &lt;v4-nat-internal&gt;0.0.0.1&lt;/v4-nat-internal&gt;

+								    &lt;v4-nat-next-hop-address&gt;0.0.0.1&lt;/v4-nat-next-hop-address&gt;

+								    &lt;v4-nat-external&gt;0.0.0.1&lt;/v4-nat-external&gt;

+								  &lt;/v4-nat-mapping-entries&gt;

+								&lt;/nat&gt;

+								&lt;vr-designation&gt;primary&lt;/vr-designation&gt;

+								&lt;v4-vce-loopback-address&gt;162.200.3.144&lt;/v4-vce-loopback-address&gt;

+								&lt;v6-vr-lan-prefix-length&gt;64&lt;/v6-vr-lan-prefix-length&gt;

+								&lt;v6-vce-wan-address&gt;2001:1890:12e3:2da::&lt;/v6-vce-wan-address&gt;

+								&lt;v6-vr-lan-prefix&gt;2620:0:10d0:f:ffff:ffff:ffff:fffe&lt;/v6-vr-lan-prefix&gt;

+								&lt;v4-vr-lan-prefix-length&gt;24&lt;/v4-vr-lan-prefix-length&gt;

+								&lt;v4-vr-lan-prefix&gt;10.192.27.254&lt;/v4-vr-lan-prefix&gt;

+								&lt;v4-public-lan-prefixes&gt;

+									&lt;t-provided-v4-lan-public-prefixes&gt;

+										&lt;request-index&gt;1&lt;/request-index&gt;

+										&lt;v4-next-hop-address&gt;192.168.1.2&lt;/v4-next-hop-address&gt;

+										&lt;v4-lan-public-prefix&gt;192.168.1.1&lt;/v4-lan-public-prefix&gt;

+										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

+									&lt;/t-provided-v4-lan-public-prefixes&gt;

+									&lt;t-provided-v4-lan-public-prefixes&gt;

+										&lt;request-index&gt;1&lt;/request-index&gt;

+										&lt;v4-next-hop-address&gt;192.168.1.72&lt;/v4-next-hop-address&gt;

+										&lt;v4-lan-public-prefix&gt;192.168.1.71&lt;/v4-lan-public-prefix&gt;

+										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

+									&lt;/t-provided-v4-lan-public-prefixes&gt;

+									&lt;t-provided-v4-lan-public-prefixes&gt;

+										&lt;request-index&gt;1&lt;/request-index&gt;

+										&lt;v4-next-hop-address&gt;192.168.1.68&lt;/v4-next-hop-address&gt;

+										&lt;v4-lan-public-prefix&gt;192.168.1.67&lt;/v4-lan-public-prefix&gt;

+										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

+									&lt;/t-provided-v4-lan-public-prefixes&gt;

+								&lt;/v4-public-lan-prefixes&gt;

+								&lt;v6-public-lan-prefixes&gt;

+									&lt;t-provided-v6-lan-public-prefixes&gt;

+										&lt;request-index&gt;1&lt;/request-index&gt;

+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

+										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;

+										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

+									&lt;/t-provided-v6-lan-public-prefixes&gt;

+									&lt;t-provided-v6-lan-public-prefixes&gt;

+										&lt;request-index&gt;1&lt;/request-index&gt;

+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

+										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:3da::&lt;/v6-lan-public-prefix&gt;

+										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

+									&lt;/t-provided-v6-lan-public-prefixes&gt;

+									&lt;t-provided-v6-lan-public-prefixes&gt;

+										&lt;request-index&gt;1&lt;/request-index&gt;

+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

+										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:4da::&lt;/v6-lan-public-prefix&gt;

+										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

+									&lt;/t-provided-v6-lan-public-prefixes&gt;

+								&lt;/v6-public-lan-prefixes&gt;

+							&lt;/vr-lan-interface&gt;

+							&lt;routing-protocol&gt;none&lt;/routing-protocol&gt;

+						&lt;/vr-lan&gt;

+&lt;ucpe-vms-service-information&gt;				

+ &lt;transport-service-information&gt;

+    &lt;transport-service-type&gt;AVPN&lt;/transport-service-type&gt;

+	&lt;access-circuit-info&gt;

+	   &lt;access-circuit-id&gt;1&lt;/access-circuit-id&gt;

+	   &lt;dual-mode&gt;Active&lt;/dual-mode&gt;

+	&lt;/access-circuit-info&gt;

+	&lt;access-circuit-info&gt;

+	   &lt;access-circuit-id&gt;2&lt;/access-circuit-id&gt;

+	   &lt;dual-mode&gt;Standby&lt;/dual-mode&gt;

+	&lt;/access-circuit-info&gt;	

+ &lt;/transport-service-information&gt;

+ &lt;ucpe-information&gt;

+    &lt;ucpe-host-name&gt;hostname&lt;/ucpe-host-name&gt;

+    &lt;ucpe-activation-code&gt;activecode&lt;/ucpe-activation-code&gt;

+    &lt;out-of-band-management-modem&gt;OOB&lt;/out-of-band-management-modem&gt;

+  &lt;/ucpe-information&gt;

+  &lt;vnf-list&gt;

+	&lt;vnf-information&gt; 

+		&lt;vnf-instance-id&gt;1&lt;/vnf-instance-id&gt; 

+		&lt;vnf-sequence-number&gt;1&lt;/vnf-sequence-number&gt;

+		&lt;vnf-type&gt;ZZ&lt;/vnf-type&gt;

+		&lt;vnf-vendor&gt;JUNIPER&lt;/vnf-vendor&gt;

+		&lt;vnf-model&gt;MODEL1&lt;/vnf-model&gt;

+		&lt;vnf-id&gt;1&lt;/vnf-id&gt;

+		&lt;prov-status&gt;1&lt;/prov-status&gt;

+		&lt;operational-state&gt;1&lt;/operational-state&gt;

+		&lt;orchestration-status&gt;1&lt;/orchestration-status&gt;

+		&lt;equipment-role&gt;1&lt;/equipment-role&gt;

+    &lt;/vnf-information&gt;

+	&lt;vnf-information&gt; 

+		&lt;vnf-instance-id&gt;2&lt;/vnf-instance-id&gt; 

+		&lt;vnf-sequence-number&gt;2&lt;/vnf-sequence-number&gt;

+		&lt;vnf-type&gt;HY&lt;/vnf-type&gt;

+		&lt;vnf-vendor&gt;JUNIPER&lt;/vnf-vendor&gt;

+		&lt;vnf-model&gt;MODEL2&lt;/vnf-model&gt;

+		&lt;vnf-id&gt;2&lt;/vnf-id&gt;

+		&lt;prov-status&gt;2&lt;/prov-status&gt;

+		&lt;operational-state&gt;2&lt;/operational-state&gt;

+		&lt;orchestration-status&gt;2&lt;/orchestration-status&gt;

+		&lt;equipment-role&gt;2&lt;/equipment-role&gt;

+    &lt;/vnf-information&gt;					

+  &lt;/vnf-list&gt;

+ &lt;/ucpe-vms-service-information&gt;										

+						&lt;request-information&gt;

+							&lt;request-action&gt;Layer3ServiceActivateRequest&lt;/request-action&gt;

+							&lt;order-number&gt;4281555&lt;/order-number&gt;

+							&lt;request-id&gt;155415ab-b4a7-4382-b4c6-d17d9sm42855&lt;/request-id&gt;

+							&lt;notification-url&gt;https://csi-tst-q22.it.com:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws&lt;/notification-url&gt;

+							&lt;source&gt;OMX&lt;/source&gt;

+							&lt;order-version&gt;1&lt;/order-version&gt;

+						&lt;/request-information&gt;

+						&lt;sdnc-request-header&gt;

+							&lt;svc-action&gt;activate&lt;/svc-action&gt;

+							&lt;svc-notification-url&gt;https://msojra.mtsnjdcp1.aic.cip.com:8443/adapters/rest/SDNCNotify&lt;/svc-notification-url&gt;

+							&lt;svc-request-id&gt;5b1f3c5d-cdf9-488d-8a4b-d3f1229d7760&lt;/svc-request-id&gt;

+						&lt;/sdnc-request-header&gt;

+						&lt;l2-homing-information&gt;

+							&lt;topology&gt;MultiPoint&lt;/topology&gt;

+							&lt;preferred-aic-clli&gt;MTSNJA4LCP1&lt;/preferred-aic-clli&gt;

+							&lt;evc-name&gt;AS/VLXM/003717//SW&lt;/evc-name&gt;

+						&lt;/l2-homing-information&gt;

+						&lt;service-information&gt;

+							&lt;service-instance-id&gt;FK/VLXM/003717//SW_INTERNET&lt;/service-instance-id&gt;

+							&lt;subscriber-name&gt;FOUR SEASONS HEATING &amp; COOLING_8310006378683&lt;/subscriber-name&gt;

+							&lt;service-type&gt;SDN-ETHERNET-INTERNET&lt;/service-type&gt;

+						&lt;/service-information&gt;

+						&lt;internet-service-change-details&gt;

+							&lt;internet-evc-speed-value&gt;10&lt;/internet-evc-speed-value&gt;

+							&lt;internet-evc-speed-units&gt;Kbps&lt;/internet-evc-speed-units&gt;

+							&lt;t-provided-v4-lan-public-prefixes&gt;

+							   &lt;request-index&gt;1&lt;/request-index&gt;

+							   &lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;

+							   &lt;v4-lan-public-prefix&gt;192.168.1.15&lt;/v4-lan-public-prefix&gt;

+							   &lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

+							&lt;/t-provided-v4-lan-public-prefixes&gt;

+							&lt;t-provided-v4-lan-public-prefixes&gt;

+							   &lt;request-index&gt;2&lt;/request-index&gt;

+							   &lt;v4-next-hop-address&gt;192.168.1.16&lt;/v4-next-hop-address&gt;

+							   &lt;v4-lan-public-prefix&gt;192.168.1.16&lt;/v4-lan-public-prefix&gt;

+							   &lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

+							&lt;/t-provided-v4-lan-public-prefixes&gt;

+							&lt;t-provided-v6-lan-public-prefixes&gt;

+							   &lt;request-index&gt;1&lt;/request-index&gt;

+							   &lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

+							   &lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;

+							   &lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

+							&lt;/t-provided-v6-lan-public-prefixes&gt;

+							&lt;t-provided-v6-lan-public-prefixes&gt;

+							   &lt;request-index&gt;1&lt;/request-index&gt;

+							   &lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

+							   &lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;

+							   &lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

+							&lt;/t-provided-v6-lan-public-prefixes&gt;

+						&lt;/internet-service-change-details&gt;

+					&lt;/service-data&gt;

+				&lt;/layer3-service-list&gt;

+</RequestData>

+</SDNCAdapterCallbackRequest>

diff --git a/bpmn/MSOCommonBPMN/src/test/resources/sdncadaptercallbackrequest_404CallBack.xml b/bpmn/MSOCommonBPMN/src/test/resources/sdncadaptercallbackrequest_404CallBack.xml
index 5808444..aa481ea 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/sdncadaptercallbackrequest_404CallBack.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/sdncadaptercallbackrequest_404CallBack.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<SDNCAdapterCallbackRequest
-	xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
-	<CallbackHeader>
-		<RequestId>39542e39-ccc3-4d1a-8b79-04ce88526613</RequestId>
-		<ResponseCode>404</ResponseCode>
-		<ResponseMessage>Error processing request to SDNC. Not Found.
-			https://sdncodl.us.aic.cip.att.com:8443/restconf/config/L3SDN-API:services/layer3-service-list/MVM%2FVLXP%2F000855%2F%2FShakeout.
-			SDNC Returned-[error-type:application, error-tag:data-missing,
-			error-message:Request could not be completed because the relevant
-			data model content does not exist.]</ResponseMessage>
-	</CallbackHeader>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

+<SDNCAdapterCallbackRequest

+	xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

+	<CallbackHeader>

+		<RequestId>39542e39-ccc3-4d1a-8b79-04ce88526613</RequestId>

+		<ResponseCode>404</ResponseCode>

+		<ResponseMessage>Error processing request to SDNC. Not Found.

+			https://sdncodl.us.aic.cip.com:8443/restconf/config/L3SDN-API:services/layer3-service-list/MVM%2FVLXP%2F000855%2F%2FShakeout.

+			SDNC Returned-[error-type:application, error-tag:data-missing,

+			error-message:Request could not be completed because the relevant

+			data model content does not exist.]</ResponseMessage>

+	</CallbackHeader>

 </SDNCAdapterCallbackRequest>
\ No newline at end of file