Containerization feature of SO

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

10 files changed, 0 insertions, 394 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeCallbackResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeCallbackResponse.xml
deleted file mode 100644
index a421355aba..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeCallbackResponse.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<createVolumeGroupResponse>
-    <messageId>{{MESSAGE-ID}}</messageId>
-    <volumeGroupCreated>true</volumeGroupCreated>
-    <volumeGroupId>d485ecee-957c-4a0a-8b95-27a22b90103f</volumeGroupId>
-    <volumeGroupOutputs>
-        <entry>
-            <key>mmsc_vol_1</key>
-            <value>a73e0fe9-1ce8-49c2-8fef-e2788605be29</value>
-        </entry>
-        <entry>
-            <key>mmsc_vol_2</key>
-            <value>37b6455a-5ea8-463a-89e3-0efeaf7b7c6d</value>
-        </entry>
-        <entry>
-            <key>nemsfe_vol_1</key>
-            <value>b7ff1c21-d138-49a3-bf13-4cfd91efaf48</value>
-        </entry>
-        <entry>
-            <key>nemsbe_vol_1</key>
-            <value>a5988471-cd42-44d8-b078-64f2f13d3d4c</value>
-        </entry>
-        <entry>
-            <key>mmsc_vol_5</key>
-            <value>f7b91c1e-ab8c-413a-a850-ba80a246c7e0</value>
-        </entry>
-        <entry>
-            <key>nemsfe_vol_2</key>
-            <value>957ea3f3-2d4a-4707-bfd2-ba66f42037c2</value>
-        </entry>
-        <entry>
-            <key>mmsc_vol_3</key>
-            <value>de6fccfe-d61a-48b0-b03b-87bf1bf749b3</value>
-        </entry>
-        <entry>
-            <key>mmsc_vol_4</key>
-            <value>76162310-2c38-4c32-981c-5c2880190077</value>
-        </entry>
-    </volumeGroupOutputs>
-    <volumeGroupRollback>
-        <cloudSiteId>RDM2WAGPLCP</cloudSiteId>
-        <messageId>e585e4f4-9452-437a-b294-45a2d6d3b7a3</messageId>
-        <msoRequest>
-            <requestId>c30b9453-4b68-4c2e-aacf-58a5ba648bf5</requestId>
-            <serviceInstanceId>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</serviceInstanceId>
-        </msoRequest>
-        <tenantId>1bbab536a19b4756926e7d0ec1eb543c</tenantId>
-        <volumeGroupCreated>true</volumeGroupCreated>
-        <volumeGroupId>78987</volumeGroupId>
-        <volumeGroupStackId>ZRDM1MMSC01_base_vol/7f74e5e1-5fc1-4593-ac7e-cc9899a106ef</volumeGroupStackId>
-    </volumeGroupRollback>
-    <volumeGroupStackId>ZRDM1MMSC01_base_vol/7f74e5e1-5fc1-4593-ac7e-cc9899a106ef</volumeGroupStackId>
-</createVolumeGroupResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeNoRollbackRequest.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeNoRollbackRequest.xml
deleted file mode 100644
index 803a847bbc..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeNoRollbackRequest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<volume-request xmlns="http://org.openecomp/mso/infra/vnf-request/v1" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<request-info>
-		<test-data-only>123abc</test-data-only> <!-- don't remove this tag. Its used for junit test -->
-		<request-id>d8d4fcfa-fd7e-4413-b19d-c95aa67291b8</request-id>
-		<action>CREATE_VF_MODULE_VOL</action>
-		<source>SoapUI-bns-create-base-vol-1001-1</source>
-	</request-info>
-	<volume-inputs>
-		<vnf-type>Test/vSAMP12</vnf-type>
-		<vf-module-model-name>vSAMP12::base::module-0</vf-module-model-name>
-		<backout-on-failure>false</backout-on-failure>
-		<asdc-service-model-version/>
-		<service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
-		<aic-cloud-region>MDTWNJ21</aic-cloud-region>
-		<tenant-id>897deadc2b954a6bac6d3c197fb3525e</tenant-id>
-		<volume-group-name>MSOTESTVOL101a-vSAMP12_base_vol_module-0</volume-group-name>
-		<volume-group-id/>
-	</volume-inputs>
-	<volume-params>
-		<param name="param1">value1</param>"
-		<param name="param2">value2</param>"
-		<param name="param3">value3</param>"
-	</volume-params>	
-</volume-request>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeRequest.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeRequest.xml
deleted file mode 100644
index e6ada9c826..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeRequest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<volume-request xmlns="http://org.openecomp/mso/infra/vnf-request/v1" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<request-info>
-		<test-data-only>123abc</test-data-only> <!-- don't remove this tag. Its used for junit test -->
-		<request-id>d8d4fcfa-fd7e-4413-b19d-c95aa67291b8</request-id>
-		<action>CREATE_VF_MODULE_VOL</action>
-		<source>SoapUI-bns-create-base-vol-1001-1</source>
-	</request-info>
-	<volume-inputs>
-		<vnf-type>Test/vSAMP12</vnf-type>
-		<vf-module-model-name>vSAMP12::base::module-0</vf-module-model-name>
-		<backout-on-failure>true</backout-on-failure>
-		<asdc-service-model-version/>
-		<service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
-		<aic-cloud-region>MDTWNJ21</aic-cloud-region>
-		<tenant-id>897deadc2b954a6bac6d3c197fb3525e</tenant-id>
-		<volume-group-name>MSOTESTVOL101a-vSAMP12_base_vol_module-0</volume-group-name>
-		<volume-group-id/>
-	</volume-inputs>
-	<volume-params>
-		<param name="param1">value1</param>"
-		<param name="param2">value2</param>"
-		<param name="param3">value3</param>"
-	</volume-params>	
-</volume-request>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/GenericVnf.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/GenericVnf.xml
deleted file mode 100644
index 4c18356bf9..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/GenericVnf.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<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/RollbackVfModuleVolumeCallbackResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/RollbackVfModuleVolumeCallbackResponse.xml
deleted file mode 100644
index 6ab9416617..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/RollbackVfModuleVolumeCallbackResponse.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rollbackVolumeGroupResponse>
-  <messageId>{{MESSAGE-ID}}</messageId>
-  <volumeGroupRolledback>true</volumeGroupRolledback>
-</rollbackVolumeGroupResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_VID_request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_VID_request.json
deleted file mode 100644
index 6cc84c79b6..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_VID_request.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"requestDetails": {
-		"modelInfo": {
-			"modelType": "volumeGroup",
-			"modelId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
-			"modelUuid": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
-			"modelName": "vSAMP12::base::module-0",
-			"modelVersion": "1"
-		},
-		"cloudConfiguration": {
-			"lcpCloudRegionId": "mdt1",
-			"tenantId": "88a6ca3ee0394ade9403f075db23167e"
-		},
-		"requestInfo": {
-			"instanceName": "MSOTESTVOL103W-vSAMP12_base_vol_module-0",
-			"source": "VID",
-			"callbackUrl": "{do we support this???}"
-		},
-		"relatedInstanceList": [
-			{
-				"relatedInstance": {
-					"instanceId": "{service-instance-id}",
-					"modelInfo": {
-						"modelType": "service",
-						"modelId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
-						"modelUuid": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
-						"modelName": "{parent service model name}",
-						"modelVersion": "1"
-					}
-				}
-			},
-			{
-				"relatedInstance": {
-					"instanceId": "{vnf-instance-id}",
-					"modelInfo": {
-						"modelType": "vnf",
-						"modelId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
-						"modelUuid": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
-						"modelName": "Test/vSAMP12",
-						"modelVersion": "1"
-					}
-				}
-			}
-		],
-		"requestParameters": {
-			"backoutOnFailure": true,
-			"serviceId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-			"userParams": [
-				{
-					"name": "vnfName",
-					"value": "STMTN5MMSC20"
-				},
-				{
-					"name": "vnfName2",
-					"value": "US1117MTSNJVBR0246"
-				},
-				{
-					"name": "vnfNmInformation",
-					"value": ""
-				},
-				{
-					"name": "vnfType",
-					"value": "pcrf-capacity"
-				},
-				{
-					"name": "vnfId",
-					"value": "skask"
-				},
-				{
-					"name": "vnfStackId",
-					"value": "slowburn"
-				},
-				{
-					"name": "vnfStatus",
-					"value": "created"
-				},
-				{
-					"name": "aicCloudRegion",
-					"value": "MDTWNJ21"
-				},
-				{
-					"name": "availabilityZone",
-					"value": "slcp3-esx-az01"
-				},
-				{
-					"name": "oamNetworkName",
-					"value": "VLAN-OAM-1323"
-				},
-				{
-					"name": "vmName",
-					"value": "slcp34246vbc246ceb"
-				},
-				{
-					"name": "ipagNetworkId",
-					"value": "970cd2b9-7f09-4a12-af47-182ea38ba1f0"
-				},
-				{
-					"name": "vpeNetworkId",
-					"value": "545cc2c3-1930-4100-b534-5d82d0e12bb6"
-				}
-			]
-		}
-	}
-}
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
deleted file mode 100644
index bff26fa78a..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_createVolumeName_AAIResponse_Success.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<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_deleteVolumeName_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_deleteVolumeName_AAIResponse_Success.xml
deleted file mode 100644
index 1574310474..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_deleteVolumeName_AAIResponse_Success.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-	<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="helloWorld-GetMethod(Logical)"/>
-		  <rest:header name="Content-Length" value="0"/>
-		  <rest:header name="breadcrumbId" value="ID-mtsnjv9aaas23-44965-1459957053425-0-211467"/>
-		  <rest:header name="X-CSI-UniqueTransactionId"
-					   value="AjscCsiRestful28795@mtsnjv9aaas23d44059bc-ef96-4af8-a28b-98044e08d7af"/>
-		  <rest:header name="User-Agent" value="Jakarta Commons-HttpClient/3.1"/>
-		  <rest:header name="X-TransactionID" value="3749995c-266b-4025-a0c4-4ce6983efc66"/>
-		  <rest:header name="X-CSI-ServiceName" value="helloWorld"/>
-		  <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~bbd0e78f-d4e7-41be-b9ad-4a6767fa660a"/>
-		  <rest:header name="X-CSI-MessageId" value="6ccfeb13-56da-4836-bfbd-5a42dee60939"/>
-		  <rest:header name="X-AAI-TXID" value="mtsnjv9aaas23-20160408-16:53:04:629-73256"/>
-		  <rest:header name="Content-Type" value="application/xml"/>
-		  <rest:header name="Accept" value="application/xml"/>
-	   </rest:headers>
-	</rest:RESTResponse>
\ No newline at end of file
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
deleted file mode 100644
index cb20a41ca0..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_queryVolumeName_AAIResponse_Success.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<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>

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_updateVolumeName_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_updateVolumeName_AAIResponse_Success.xml
deleted file mode 100644
index 1574310474..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_updateVolumeName_AAIResponse_Success.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-	<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="helloWorld-GetMethod(Logical)"/>
-		  <rest:header name="Content-Length" value="0"/>
-		  <rest:header name="breadcrumbId" value="ID-mtsnjv9aaas23-44965-1459957053425-0-211467"/>
-		  <rest:header name="X-CSI-UniqueTransactionId"
-					   value="AjscCsiRestful28795@mtsnjv9aaas23d44059bc-ef96-4af8-a28b-98044e08d7af"/>
-		  <rest:header name="User-Agent" value="Jakarta Commons-HttpClient/3.1"/>
-		  <rest:header name="X-TransactionID" value="3749995c-266b-4025-a0c4-4ce6983efc66"/>
-		  <rest:header name="X-CSI-ServiceName" value="helloWorld"/>
-		  <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~bbd0e78f-d4e7-41be-b9ad-4a6767fa660a"/>
-		  <rest:header name="X-CSI-MessageId" value="6ccfeb13-56da-4836-bfbd-5a42dee60939"/>
-		  <rest:header name="X-AAI-TXID" value="mtsnjv9aaas23-20160408-16:53:04:629-73256"/>
-		  <rest:header name="Content-Type" value="application/xml"/>
-		  <rest:header name="Accept" value="application/xml"/>
-	   </rest:headers>
-	</rest:RESTResponse>
\ No newline at end of file