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

1 files changed, 211 insertions, 211 deletions

diff --git a/bpmn/MSOCommonBPMN/src/test/resources/sdncDeleteResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/sdncDeleteResponse.xml
index d656d04187..c8a2e30282 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