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

3 files changed, 135 insertions, 135 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/GenericVnf.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/GenericVnf.xml
index aea1a46017..4c18356bf9 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/GenericVnf.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/GenericVnf.xml
@@ -1,38 +1,38 @@
-<generic-vnf xmlns="http://org.openecomp.aai.inventory/v8">
-	<vnf-id>TEST-VNF-ID-0123</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 xmlns="http://org.openecomp.aai.inventory/v8">

+	<vnf-id>TEST-VNF-ID-0123</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>
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_createVolumeName_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_createVolumeName_AAIResponse_Success.xml
index 02b43ff186..bff26fa78a 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_createVolumeName_AAIResponse_Success.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_createVolumeName_AAIResponse_Success.xml
@@ -1,49 +1,49 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
-				   statusCode="200">
-   <rest:headers>
-	  <rest:header name="X-CSI-Internal-WriteableRequest" value="true"/>
-	  <rest:header name="X-CSI-MethodName" value="UNKNOWN"/>
-	  <rest:header name="Content-Length" value="968"/>
-	  <rest:header name="breadcrumbId" value="ID-mtsnjv9aaas23-44965-1459957053425-0-211465"/>
-	  <rest:header name="X-CSI-UniqueTransactionId"
-				   value="AjscCsiRestful28795@mtsnjv9aaas237d4a4d21-e60a-495f-935f-cc225dc3c847"/>
-	  <rest:header name="User-Agent" value="Jakarta Commons-HttpClient/3.1"/>
-	  <rest:header name="X-TransactionID" value="3a19f95d-d63e-4a8e-8b9c-6563895628aa"/>
-	  <rest:header name="X-CSI-ServiceName" value="UNKNOWN"/>
-	  <rest:header name="Server" value="Jetty(9.2.z-SNAPSHOT)"/>
-	  <rest:header name="Cache-Control" value="no-cache,no-store"/>
-	  <rest:header name="X-FromAppId" value="MSO"/>
-	  <rest:header name="Date" value="Fri,08 Apr 2016 16:53:04 GMT"/>
-	  <rest:header name="X-CSI-ConversationId"
-				   value="ajscUser~CNG-CSI~c0a2bb44-2167-4e85-ad6a-483a24c0823a"/>
-	  <rest:header name="volume-group-name" value="simpleCinderVolume_201604071"/>
-	  <rest:header name="X-CSI-MessageId" value="f6d6eed4-456e-4033-be04-b17582902dc2"/>
-	  <rest:header name="X-AAI-TXID" value="mtsnjv9aaas23-20160408-16:53:04:592-73255"/>
-	  <rest:header name="Content-Type" value="application/xml"/>
-	  <rest:header name="Accept" value="application/xml"/>
-   </rest:headers>
-   <rest:payload contentType="text/xml">
-	  <volume-group xmlns="http://org.openecomp.aai.inventory/v8">
-		 <volume-group-id>simpleCinderVolume_201604071</volume-group-id>
-		 <volume-group-name>simpleCinderVolume_201604071</volume-group-name>
-		 <heat-stack-id>simpleCinderVolume_201604071</heat-stack-id>
-		 <vnf-type>simple_cinder_master</vnf-type>
-		 <orchestration-status>Pending</orchestration-status>
-		 <resource-version>1460134360</resource-version>
-		 <relationship-list>
-			<relationship>
-			   <related-to>tenant</related-to>
-			   <related-link>https://aai-ext1.test.com:8443/aai/v6/cloud-infrastructure/tenants/tenant/897deadc2b954a6bac6d3c197fb3525e/</related-link>
-			   <relationship-data>
-				  <relationship-key>tenant.tenant-id</relationship-key>
-				  <relationship-value>897deadc2b954a6bac6d3c197fb3525e</relationship-value>
-			   </relationship-data>
-			   <related-to-property>
-				  <property-key>tenant.tenant-name</property-key>
-				  <property-value>MSOTest1</property-value>
-			   </related-to-property>
-			</relationship>
-		 </relationship-list>
-	  </volume-group>
-   </rest:payload>
-</rest:RESTResponse>
+<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

+				   statusCode="200">

+   <rest:headers>

+	  <rest:header name="X-CSI-Internal-WriteableRequest" value="true"/>

+	  <rest:header name="X-CSI-MethodName" value="UNKNOWN"/>

+	  <rest:header name="Content-Length" value="968"/>

+	  <rest:header name="breadcrumbId" value="ID-mtsnjv9aaas23-44965-1459957053425-0-211465"/>

+	  <rest:header name="X-CSI-UniqueTransactionId"

+				   value="AjscCsiRestful28795@mtsnjv9aaas237d4a4d21-e60a-495f-935f-cc225dc3c847"/>

+	  <rest:header name="User-Agent" value="Jakarta Commons-HttpClient/3.1"/>

+	  <rest:header name="X-TransactionID" value="3a19f95d-d63e-4a8e-8b9c-6563895628aa"/>

+	  <rest:header name="X-CSI-ServiceName" value="UNKNOWN"/>

+	  <rest:header name="Server" value="Jetty(9.2.z-SNAPSHOT)"/>

+	  <rest:header name="Cache-Control" value="no-cache,no-store"/>

+	  <rest:header name="X-FromAppId" value="MSO"/>

+	  <rest:header name="Date" value="Fri,08 Apr 2016 16:53:04 GMT"/>

+	  <rest:header name="X-CSI-ConversationId"

+				   value="ajscUser~CNG-CSI~c0a2bb44-2167-4e85-ad6a-483a24c0823a"/>

+	  <rest:header name="volume-group-name" value="simpleCinderVolume_201604071"/>

+	  <rest:header name="X-CSI-MessageId" value="f6d6eed4-456e-4033-be04-b17582902dc2"/>

+	  <rest:header name="X-AAI-TXID" value="mtsnjv9aaas23-20160408-16:53:04:592-73255"/>

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

+	  <rest:header name="Accept" value="application/xml"/>

+   </rest:headers>

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

+	  <volume-group xmlns="http://org.openecomp.aai.inventory/v8">

+		 <volume-group-id>simpleCinderVolume_201604071</volume-group-id>

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

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

+		 <vnf-type>simple_cinder_master</vnf-type>

+		 <orchestration-status>Pending</orchestration-status>

+		 <resource-version>1460134360</resource-version>

+		 <relationship-list>

+			<relationship>

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

+			   <related-link>https://aai-ext1.test.com:8443/aai/v6/cloud-infrastructure/tenants/tenant/897deadc2b954a6bac6d3c197fb3525e/</related-link>

+			   <relationship-data>

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

+				  <relationship-value>897deadc2b954a6bac6d3c197fb3525e</relationship-value>

+			   </relationship-data>

+			   <related-to-property>

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

+				  <property-value>MSOTest1</property-value>

+			   </related-to-property>

+			</relationship>

+		 </relationship-list>

+	  </volume-group>

+   </rest:payload>

+</rest:RESTResponse>

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_queryVolumeName_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_queryVolumeName_AAIResponse_Success.xml
index 5e8913f335..cb20a41ca0 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_queryVolumeName_AAIResponse_Success.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_queryVolumeName_AAIResponse_Success.xml
@@ -1,49 +1,49 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
-				   statusCode="200">
-   <rest:headers>
-	  <rest:header name="X-CSI-Internal-WriteableRequest" value="true"/>
-	  <rest:header name="X-CSI-MethodName" value="UNKNOWN"/>
-	  <rest:header name="Content-Length" value="968"/>
-	  <rest:header name="breadcrumbId" value="ID-mtsnjv9aaas23-44965-1459957053425-0-211465"/>
-	  <rest:header name="X-CSI-UniqueTransactionId"
-				   value="AjscCsiRestful28795@mtsnjv9aaas237d4a4d21-e60a-495f-935f-cc225dc3c847"/>
-	  <rest:header name="User-Agent" value="Jakarta Commons-HttpClient/3.1"/>
-	  <rest:header name="X-TransactionID" value="3a19f95d-d63e-4a8e-8b9c-6563895628aa"/>
-	  <rest:header name="X-CSI-ServiceName" value="UNKNOWN"/>
-	  <rest:header name="Server" value="Jetty(9.2.z-SNAPSHOT)"/>
-	  <rest:header name="Cache-Control" value="no-cache,no-store"/>
-	  <rest:header name="X-FromAppId" value="MSO"/>
-	  <rest:header name="Date" value="Fri,08 Apr 2016 16:53:04 GMT"/>
-	  <rest:header name="X-CSI-ConversationId"
-				   value="ajscUser~CNG-CSI~c0a2bb44-2167-4e85-ad6a-483a24c0823a"/>
-	  <rest:header name="volume-group-name" value="simpleCinderVolume_201604071"/>
-	  <rest:header name="X-CSI-MessageId" value="f6d6eed4-456e-4033-be04-b17582902dc2"/>
-	  <rest:header name="X-AAI-TXID" value="mtsnjv9aaas23-20160408-16:53:04:592-73255"/>
-	  <rest:header name="Content-Type" value="application/xml"/>
-	  <rest:header name="Accept" value="application/xml"/>
-   </rest:headers>
-   <rest:payload contentType="text/xml">
-	  <volume-group xmlns="http://org.openecomp.aai.inventory/v8">
-		 <volume-group-id>8424bb3c-c3e7-4553-9662-469649ed9379</volume-group-id>
-		 <volume-group-name>MSOTESTVOL103W-vSAMP12_base_vol_module-0</volume-group-name>
-		 <heat-stack-id/>
-		 <vnf-type>simple_cinder_master</vnf-type>
-		 <orchestration-status>Pending</orchestration-status>
-		 <resource-version>1460134360</resource-version>
-		 <relationship-list>
-			<relationship>
-			   <related-to>tenant</related-to>
-			   <related-link>https://aai-ext1.test.com:8443/aai/v6/cloud-infrastructure/tenants/tenant/897deadc2b954a6bac6d3c197fb3525e/</related-link>
-			   <relationship-data>
-				  <relationship-key>tenant.tenant-id</relationship-key>
-				  <relationship-value>897deadc2b954a6bac6d3c197fb3525e</relationship-value>
-			   </relationship-data>
-			   <related-to-property>
-				  <property-key>tenant.tenant-name</property-key>
-				  <property-value>MSOTest1</property-value>
-			   </related-to-property>
-			</relationship>
-		 </relationship-list>
-	  </volume-group>
-   </rest:payload>
-</rest:RESTResponse>
+<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

+				   statusCode="200">

+   <rest:headers>

+	  <rest:header name="X-CSI-Internal-WriteableRequest" value="true"/>

+	  <rest:header name="X-CSI-MethodName" value="UNKNOWN"/>

+	  <rest:header name="Content-Length" value="968"/>

+	  <rest:header name="breadcrumbId" value="ID-mtsnjv9aaas23-44965-1459957053425-0-211465"/>

+	  <rest:header name="X-CSI-UniqueTransactionId"

+				   value="AjscCsiRestful28795@mtsnjv9aaas237d4a4d21-e60a-495f-935f-cc225dc3c847"/>

+	  <rest:header name="User-Agent" value="Jakarta Commons-HttpClient/3.1"/>

+	  <rest:header name="X-TransactionID" value="3a19f95d-d63e-4a8e-8b9c-6563895628aa"/>

+	  <rest:header name="X-CSI-ServiceName" value="UNKNOWN"/>

+	  <rest:header name="Server" value="Jetty(9.2.z-SNAPSHOT)"/>

+	  <rest:header name="Cache-Control" value="no-cache,no-store"/>

+	  <rest:header name="X-FromAppId" value="MSO"/>

+	  <rest:header name="Date" value="Fri,08 Apr 2016 16:53:04 GMT"/>

+	  <rest:header name="X-CSI-ConversationId"

+				   value="ajscUser~CNG-CSI~c0a2bb44-2167-4e85-ad6a-483a24c0823a"/>

+	  <rest:header name="volume-group-name" value="simpleCinderVolume_201604071"/>

+	  <rest:header name="X-CSI-MessageId" value="f6d6eed4-456e-4033-be04-b17582902dc2"/>

+	  <rest:header name="X-AAI-TXID" value="mtsnjv9aaas23-20160408-16:53:04:592-73255"/>

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

+	  <rest:header name="Accept" value="application/xml"/>

+   </rest:headers>

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

+	  <volume-group xmlns="http://org.openecomp.aai.inventory/v8">

+		 <volume-group-id>8424bb3c-c3e7-4553-9662-469649ed9379</volume-group-id>

+		 <volume-group-name>MSOTESTVOL103W-vSAMP12_base_vol_module-0</volume-group-name>

+		 <heat-stack-id/>

+		 <vnf-type>simple_cinder_master</vnf-type>

+		 <orchestration-status>Pending</orchestration-status>

+		 <resource-version>1460134360</resource-version>

+		 <relationship-list>

+			<relationship>

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

+			   <related-link>https://aai-ext1.test.com:8443/aai/v6/cloud-infrastructure/tenants/tenant/897deadc2b954a6bac6d3c197fb3525e/</related-link>

+			   <relationship-data>

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

+				  <relationship-value>897deadc2b954a6bac6d3c197fb3525e</relationship-value>

+			   </relationship-data>

+			   <related-to-property>

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

+				  <property-value>MSOTest1</property-value>

+			   </related-to-property>

+			</relationship>

+		 </relationship-list>

+	  </volume-group>

+   </rest:payload>

+</rest:RESTResponse>