[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>

9 files changed, 464 insertions, 464 deletions

diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfByNameResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfByNameResponse.xml
index a397e5bcba..a609a35857 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 3227a038af..2b70f0b600 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 3227a038af..2b70f0b600 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 28ce8ef1b7..b1f640f47f 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 28ce8ef1b7..b1f640f47f 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 5ffdda268f..84d8600eac 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 41815d46e6..85cd5d605a 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 a83e06ee6f..7ada696cb7 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 a83e06ee6f..5dc3033445 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