Containerization feature of SO

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

37 files changed, 0 insertions, 1297 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryBRGCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryBRGCallback.xml
deleted file mode 100644
index d81b7e8f50..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryBRGCallback.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<output xmlns="org:onap:sdnctl:vnf">

-<brg-topology  xmlns="org:onap:sdnctl:vnf">

-    <ecomp-model-information>

-        <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>

-        <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>

-        <model-version>1.0</model-version>

-        <model-name>BRGmodelname</model-name>

-        <model-customization-uuid>013bd784-9bca-4919-ae2f-ae57af27bad9</model-customization-uuid>

-    </ecomp-model-information>

-    <allotted-resource-identifiers>

-        <parent-service-instance-id>parent-service-instance-id</parent-service-instance-id>

-        <consuming-service-intance-id>consuming-service-instance-id</consuming-service-intance-id>

-        <allotted-resource-name>namefromrequest</allotted-resource-name>

-        <allotted-resource-type>brg</allotted-resource-type>

-        <allotted-resource-id>allottedresourceidfromrequest</allotted-resource-id>

-    </allotted-resource-identifiers>

-    <brg-assignments>

-        <fq-name>fq-name</fq-name>

-        <dest-network>

-            <network-id>d1</network-id>

-            <network-role>drole</network-role>

-        </dest-network>

-        <vlan-tag>vlan-tag</vlan-tag>

-        <source-network>

-            <network-id>s2</network-id>

-            <network-role>srole</network-role>

-        </source-network>

-        <txc-id>txc-id</txc-id>

-        <txc-applied-service>

-            <service-instance-id>1</service-instance-id>

-            <vnf-id>123</vnf-id>

-            <txc-fqdn>a.b.c.d</txc-fqdn>

-        </txc-applied-service>

-    </brg-assignments>

-</brg-topology>

-

-</output>

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml
deleted file mode 100644
index f74e51e9d5..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<output xmlns="org:onap:sdnctl:vnf">

-<tunnelxconn-topology  xmlns="org:onap:sdnctl:vnf">

-    <ecomp-model-information>

-        <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>

-        <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>

-        <model-version>1.0</model-version>

-        <model-name>TXCmodelname</model-name>

-        <model-customization-uuid>013bd784-9bca-4919-ae2f-ae57af27bad9</model-customization-uuid>

-    </ecomp-model-information>

-    <allotted-resource-identifiers>

-        <parent-service-instance-id>parent-service-instance-id</parent-service-instance-id>

-        <consuming-service-intance-id>consuming-service-instance-id</consuming-service-intance-id>

-        <allotted-resource-name>namefromrequest</allotted-resource-name>

-        <allotted-resource-type>tunnelxconn</allotted-resource-type>

-        <allotted-resource-id>allottedresourceidfromrequest</allotted-resource-id>

-    </allotted-resource-identifiers>

-    <tunnelxconn-assignments>

-    	<vni>my-vni</vni>

-    	<vgmux-bearer-ip>my-bearer-ip</vgmux-bearer-ip>

-    	<vgmux-lan-ip>my-lan-ip</vgmux-lan-ip>

-    </tunnelxconn-assignments>

-</tunnelxconn-topology>

-

-</output>

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/arGetById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/arGetById.xml
deleted file mode 100644
index f2063442d6..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/arGetById.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
-   <id>ar-1</id>
-   <orchestration-status>Active</orchestration-status>
-   <role>Tunnel XConn</role>
-   <type>Tunnel XConn</type>
-   <description>Tunnel XConn</description>
-   <selflink/>
-   <resource-version>1490627351232</resource-version>
-   <relationship-list>
-      <relationship>
-         <related-to>service-instance</related-to>
-         <related-link>http://localhost:28090/aai/v9/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
-         <relationship-data>
-            <relationship-key>customer.global-customer-id</relationship-key>
-            <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
-         </relationship-data> 
-         <relationship-data>
-            <relationship-key>service-subscription.service-type</relationship-key>
-            <relationship-value>123456789</relationship-value>
-         </relationship-data>
-         <relationship-data>
-            <relationship-key>service-instance.service-instance-id</relationship-key>
-            <relationship-value>88819355-9a71-4ddc-9e22-373f0644b40b</relationship-value>
-         </relationship-data>
-         <related-to-property>
-            <property-key>service-instance.service-instance-name</property-key>
-            <property-value>vcpe-1702-m010904-name4</property-value>
-         </related-to-property>
-      </relationship>
-   </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json
deleted file mode 100644
index e99dd9ccda..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{ "serviceResources"    : {
-	"modelInfo"       : {
-		"modelName"          : "MSO Test Network",
-		"modelUuid"          : "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e",
-		"modelInvariantUuid" : "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f",
-		"modelVersion"       : null
-	},
-	"serviceVnfs": [
-		{ "modelInfo"                    : {
-			"modelName"              : "vHNF for DHV Test",
-			"modelUuid"              : "7097d8bb-f6ad-4cf7-866e-6a04c8f1b332",
-			"modelInvariantUuid"     : "6ea0b528-e303-4686-aa77-aa2fcbdccb96",
-			"modelVersion"           : "2.0",
-			"modelCustomizationUuid" : "da86dd87-43c5-458c-b226-5315b7be9ad5",
-			"modelInstanceName"      : "vHNF for DHV Test 17"
-			},
-		"toscaNodeType"            : null,
-		"nfFunction"           	: null,
-		"nfType"              		: null,
-		"nfRole"              		: null,
-		"nfNamingCode"         	: null,
-			"vfModules": [
-				{
-					"modelInfo"               : { 
-						"modelName"              : "VhnfForDhvTest..base_TEST..module-0",
-						"modelUuid"              : "ebc3d18c-3e62-4c24-bcd6-961e98701a0a",
-						"modelInvariantUuid"     : "f5696ec0-ec71-4916-bf3b-93a654efcba4",
-						"modelVersion"           : "1",
-						"modelCustomizationUuid" : "1740536a-742e-40f5-b9c8-83918849a787"
-					},		"isBase"                 : true,
-					"vfModuleLabel"          : "base_TEST",
-					"initialCount"           : 1,
-					"hasVolumeGroup"           : true
-				}
-			]
-		}
-		],
-	"serviceNetworks": [
-			{
-			"modelInfo"                : {
-				"modelName"              : "CONTRAIL_BASIC",
-				"modelUuid"              : "fe5be3a6-dbe0-46d6-bcac-44dc841a7edc",
-				"modelInvariantUuid"     : "ab07fbd8-185a-45ac-be45-db3eb02e98d5",
-				"modelVersion"           : null,
-				"modelCustomizationUuid" : "0cb9b26a-9820-48a7-86e5-16c510e993d9",
-				"modelInstanceName"      : "CONTRAIL_BASIC 5"
-		},
-			"toscaNodeType"            : null,
-			"networkType"              : null,
-			"networkTechnology"        : null,
-			"networkRole"              : null,
-			"networkScope"             : null
-		}
-		],
-	"serviceAllottedResources": [
-			{
-			"modelInfo"       : {
-				"modelName"              : "IP_MUX_Demux",
-				"modelUuid"              : "64a1a718-556b-48ce-b3b7-ed3237ccc94f",
-				"modelInvariantUuid"     : "f110ef53-a0a6-4d72-ab91-fd88a835e8c4",
-				"modelVersion"           : "2.0",
-				"modelCustomizationUuid" : "4bab0880-2f06-4aeb-87cb-3734c8e8bf93",
-				"modelInstanceName"      : "Pri_IP_MUX_Demux 1"
-			},
-			"toscaNodeType"              : null,
-			"allottedResourceType"              : "Tunnel XConn",
-			"allottedResourceRole"              : "Tunnel XConn",
-			"providingServiceModelInvariantUuid"              : null,
-			"nfFunction"              : null,
-			"nfType"              : null,
-			"nfRole"              : null,
-			"nfNamingCode"              : null,
-	        "homingSolution": {
-	          "inventoryType": "service",
-	          "serviceInstanceId": "MIS%252F1604%252F0027%252FSW_INTERNET",
-	          "vnfHostname": "MDTNJ01",
-	          "cloudOwner": "aic",
-	          "cloudRegionId": "dfwtx",
-	          "aicClli": "KDTNJ01",
-	          "aicVersion": "3.0",
-	          "entitlementPoolList": [
-	            "f1d563e8-e714-4393-8f99-cc480144a05e",
-	            "j1d563e8-e714-4393-8f99-cc480144a05e"
-	          ],
-	          "licenseKeyGroupList": [
-	            "s1d563e8-e714-4393-8f99-cc480144a05e",
-	            "b1d563e8-e714-4393-8f99-cc480144a05e"
-	          ]
-	        }
-		},
-				{
-			"modelInfo"       : {
-				"modelName"              : "Service_Admin",
-				"modelUuid"              : "73501e03-ee76-4509-a8ce-96d2a9f33ee9",
-				"modelInvariantUuid"     : "462edf71-1a3c-487b-bf55-497460ab7de3",
-				"modelVersion"           : "2.0",
-				"modelCustomizationUuid" : "a896ffad-c8f9-404e-a527-7a8d0cc99ce6",
-				"modelInstanceName"      : "Pri_Service_Admin 5"
-			},
-			"toscaNodeType"              : null,
-			"allottedResourceType"              : "BRG",
-			"allottedResourceRole"              : "BRG",
-			"providingServiceModelInvariantUuid"              : null,
-			"nfFunction"              : null,
-			"nfType"              : null,
-			"nfRole"              : null,
-			"nfNamingCode"              : null,
-	        "homingSolution": {
-	          "inventoryType": "service",
-	          "serviceInstanceId": "MIS%252F1604%252F0027%252FSW_INTERNET",
-	          "vnfHostname": "MDTNJ01",
-	          "cloudOwner": "aic",
-	          "cloudRegionId": "dfwtx",
-	          "aicClli": "KDTNJ01",
-	          "aicVersion": "3.0",
-	          "entitlementPoolList": [
-	            "f1d563e8-e714-4393-8f99-cc480144a05e",
-	            "j1d563e8-e714-4393-8f99-cc480144a05e"
-	          ],
-	          "licenseKeyGroupList": [
-	            "s1d563e8-e714-4393-8f99-cc480144a05e",
-	            "b1d563e8-e714-4393-8f99-cc480144a05e"
-	          ]
-	        }
-		}
-		]
-	}}
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesNoData.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesNoData.json
deleted file mode 100644
index 80692b27f5..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesNoData.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{ "serviceResources"    : {
-	"modelInfo"       : {
-		"modelName"          : "MSO Test Network",
-		"modelUuid"          : "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e",
-		"modelInvariantUuid" : "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f",
-		"modelVersion"       : null
-	},
-	"serviceVnfs": [],
-	"serviceNetworks": [],
-	"serviceAllottedResources": []
-	}}
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCustomer.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCustomer.xml
deleted file mode 100644
index b9d88d15db..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCustomer.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<customer xmlns="http://org.openecomp.aai.inventory/v8">
-    <global-customer-id>SDN-ETHERNET-INTERNET</global-customer-id>
-    <subscriber-name>SDN-ETHERNET-INTERNET</subscriber-name>
-    <resource-version>1490627351232</resource-version>
-    <service-subscriptions/>
-    <relationship-list/>
-</customer>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json
deleted file mode 100644
index bc0a1ef491..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-	"requestDetails":
-		{
-			"modelInfo":
-				{
-					"modelType":"service",
-					"modelInvariantUuid":"uuid-miu-svc-011-abcdef",
-					"modelVersionId":"ASDC_TOSCA_UUID",
-					"modelName":"SIModelName1",
-					"modelVersion":"2"
-				},
-			"subscriberInfo":
-				{
-					"globalSubscriberId":"SDN-ETHERNET-INTERNET",
-					"subscriberName":"Kaneohe"
-				},
-			"requestInfo":
-				{
-					"instanceName":"VCPE1",
-					"source":"VID",
-					"suppressRollback":"false",
-					"productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"
-				},
-			"cloudConfiguration":
-				{
-					"lcpCloudRegionId":"cloudowner_mdt1",
-					"tenantId":"8b1df54faa3b49078e3416e21370a3ba"
-				},
-			"requestParameters":
-				{
-					"subscriptionServiceType":"123456789",
-					"aLaCarte":"false",
-					"userParams":
-					   [
-							{
-								"name":"BRG_WAN_MAC_Address",
-								"value":"brgmac"
-							},
-							{
-								"name": "Customer_Location",
-								"value": {
-									"customerLatitude": "32.897480",
-									"customerLongitude": "-97.040443",
-									"customerName": "some_company"
-								}
-							},
-							{
-								"name":"Homing_Solution",
-								"value":"sniro"
-							}
-						]
-				}
-		}
-}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSIName.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSIName.json
deleted file mode 100644
index 4100ec76de..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSIName.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-	"requestDetails":
-		{
-			"modelInfo":
-				{
-					"modelType":"service",
-					"modelInvariantUuid":"uuid-miu-svc-011-abcdef",
-					"modelVersionId":"ASDC_TOSCA_UUID",
-					"modelName":"SIModelName1",
-					"modelVersion":"2"
-				},
-			"subscriberInfo":
-				{
-					"globalSubscriberId":"SDN-ETHERNET-INTERNET",
-					"subscriberName":"Kaneohe"
-				},
-			"requestInfo":
-				{
-					"source":"VID",
-					"suppressRollback":"false",
-					"productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"
-				},
-			"cloudConfiguration":
-				{
-					"lcpCloudRegionId":"cloudowner_mdt1",
-					"tenantId":"8b1df54faa3b49078e3416e21370a3ba"
-				},
-			"requestParameters":
-				{
-					"subscriptionServiceType":"123456789",
-					"aLaCarte":"false",
-					"userParams":
-					   [
-							{
-								"name":"BRG_WAN_MAC_Address",
-								"value":"brgmac"
-							},
-							{
-								"name": "Customer_Location",
-								"value": {
-									"customerLatitude": "32.897480",
-									"customerLongitude": "-97.040443",
-									"customerName": "some_company"
-								}
-							},
-							{
-								"name":"Homing_Solution",
-								"value":"sniro"
-							}
-						]
-				}
-		}
-}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSINameNoRollback.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSINameNoRollback.json
deleted file mode 100644
index 5fc0b04180..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSINameNoRollback.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-	"requestDetails":
-		{
-			"modelInfo":
-				{
-					"modelType":"service",
-					"modelInvariantUuid":"uuid-miu-svc-011-abcdef",
-					"modelVersionId":"ASDC_TOSCA_UUID",
-					"modelName":"SIModelName1",
-					"modelVersion":"2"
-				},
-			"subscriberInfo":
-				{
-					"globalSubscriberId":"SDN-ETHERNET-INTERNET",
-					"subscriberName":"Kaneohe"
-				},
-			"requestInfo":
-				{
-					"source":"VID",
-					"suppressRollback":"true",
-					"productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"
-				},
-			"cloudConfiguration":
-				{
-					"lcpCloudRegionId":"cloudowner_mdt1",
-					"tenantId":"8b1df54faa3b49078e3416e21370a3ba"
-				},
-			"requestParameters":
-				{
-					"subscriptionServiceType":"123456789",
-					"aLaCarte":"false",
-					"userParams":
-					   [
-							{
-								"name":"BRG_WAN_MAC_Address",
-								"value":"brgmac"
-							},
-							{
-								"name": "Customer_Location",
-								"value": {
-									"customerLatitude": "32.897480",
-									"customerLongitude": "-97.040443",
-									"customerName": "some_company"
-								}
-							},
-							{
-								"name":"Homing_Solution",
-								"value":"sniro"
-						   }
-						]
-				}
-		}
-}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/arGetBRGById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/arGetBRGById.xml
deleted file mode 100644
index 3cb31464d5..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/arGetBRGById.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
-   <id>ar-brgB</id>
-   <orchestration-status>Active</orchestration-status>
-   <role>BRG</role>
-   <type>BRG</type>
-   <description>BRG</description>
-   <selflink/>
-   <resource-version>1490627351232</resource-version>
-   <relationship-list>
-      <relationship>
-         <related-to>service-instance</related-to>
-         <related-link>http://localhost:28090/aai/v9/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
-         <relationship-data>
-            <relationship-key>customer.global-customer-id</relationship-key>
-            <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
-         </relationship-data> 
-         <relationship-data>
-            <relationship-key>service-subscription.service-type</relationship-key>
-            <relationship-value>123456789</relationship-value>
-         </relationship-data>
-         <relationship-data>
-            <relationship-key>service-instance.service-instance-id</relationship-key>
-            <relationship-value>88819355-9a71-4ddc-9e22-373f0644b40b</relationship-value>
-         </relationship-data>
-         <related-to-property>
-            <property-key>service-instance.service-instance-name</property-key>
-            <property-value>vcpe-1702-m010904-name4</property-value>
-         </related-to-property>
-      </relationship>
-   </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/arGetTXCById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/arGetTXCById.xml
deleted file mode 100644
index 97992fc00b..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/arGetTXCById.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
-   <id>ar-txcA</id>
-   <orchestration-status>Active</orchestration-status>
-   <role>Tunnel XConn</role>
-   <type>Tunnel XConn</type>
-   <description>Tunnel XConn</description>
-   <selflink/>
-   <resource-version>1490627351232</resource-version>
-   <relationship-list>
-      <relationship>
-         <related-to>service-instance</related-to>
-         <related-link>http://localhost:28090/aai/v9/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
-         <relationship-data>
-            <relationship-key>customer.global-customer-id</relationship-key>
-            <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
-         </relationship-data> 
-         <relationship-data>
-            <relationship-key>service-subscription.service-type</relationship-key>
-            <relationship-value>123456789</relationship-value>
-         </relationship-data>
-         <relationship-data>
-            <relationship-key>service-instance.service-instance-id</relationship-key>
-            <relationship-value>88819355-9a71-4ddc-9e22-373f0644b40b</relationship-value>
-         </relationship-data>
-         <related-to-property>
-            <property-key>service-instance.service-instance-name</property-key>
-            <property-value>vcpe-1702-m010904-name4</property-value>
-         </related-to-property>
-      </relationship>
-   </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getBRGArUrlById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getBRGArUrlById.xml
deleted file mode 100644
index 932dbfb2ca..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getBRGArUrlById.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<search-results xmlns="http://org.openecomp.aai.inventory">
-     <result-data>
-        <resource-type>allotted-resource</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/allotted-resources/allotted-resource/ar-brgB</resource-link>
-     </result-data>
-</search-results>
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getSI.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getSI.xml
deleted file mode 100644
index e0511873b6..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getSI.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<service-instance>
-	
-   <service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>
-   <resource-version>123456789</resource-version>	
-	<relationship-list>
-      <relationship>
-         <related-to>generic-vnf</related-to>
-         <related-link>/aai/v7/generic-vnf/vnfX</related-link>
-      </relationship>
-      <relationship>
-         <related-to>l3-network</related-to>
-         <related-link>/aai/v7/l3-network/netA</related-link>
-      </relationship>
-      <relationship>
-         <related-to>generic-vnf</related-to>
-         <related-link>/aai/v7/generic-vnf/vnfY</related-link>
-      </relationship>
-      <relationship>
-         <related-to>l3-network</related-to>
-         <related-link>/aai/v7/l3-network/netB</related-link>
-      </relationship>
-      <relationship>
-         <related-to>l3-network</related-to>
-         <related-link>/aai/v7/l3-network/netC</related-link>
-      </relationship>
-      <relationship>
-         <related-to>allotted-resource</related-to>
-         <related-link>/aai/v11/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/ar-txcA</related-link>
-      </relationship>
-      <relationship>
-         <related-to>allotted-resource</related-to>
-         <related-link>/aai/v11/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/ar-brgB</related-link>
-      </relationship>
-   </relationship-list>
-</service-instance>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getSIAfterDelArs.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getSIAfterDelArs.xml
deleted file mode 100644
index feb535c238..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getSIAfterDelArs.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<service-instance>
-	<service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>
-	<service-type>SDN-MOBILITY</service-type>
-	<resource-version>123456789</resource-version>
-	
-	<relationship-list>
-	</relationship-list>
-</service-instance>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getTXCArUrlById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getTXCArUrlById.xml
deleted file mode 100644
index 1c4f13d642..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getTXCArUrlById.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<search-results xmlns="http://org.openecomp.aai.inventory">
-     <result-data>
-        <resource-type>allotted-resource</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/allotted-resources/allotted-resource/ar-txcA</resource-link>
-     </result-data>
-</search-results>
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/request.json
deleted file mode 100644
index dc4669e8d9..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/request.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"requestDetails":
-		{
-			"modelInfo":
-				{
-					"modelType":"service",
-					"modelInvariantUuid":"uuid-miu-svc-011-abcdef",
-					"modelVersionId":"ASDC_TOSCA_UUID",
-					"modelName":"SIModelName1",
-					"modelVersion":"2"
-				},
-			"subscriberInfo":
-				{
-					"globalSubscriberId":"SDN-ETHERNET-INTERNET",
-					"subscriberName":"Kaneohe"
-				},
-			"requestInfo":
-				{
-					"instanceName":"VCPE1",
-					"source":"VID",
-					"suppressRollback":"false",
-					"productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"
-				},
-			"cloudConfiguration":
-				{
-					"lcpCloudRegionId":"mdt1",
-					"tenantId":"8b1df54faa3b49078e3416e21370a3ba"
-				},
-			"requestParameters":
-				{
-					"subscriptionServiceType":"123456789",
-					"aLaCarte":"false",
-					"userParams":
-						{
-							"BRG_WAN_MAC_Address" : "brgmac"
-						}
-				}
-				
-		}
-}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/serviceToDelete.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/serviceToDelete.xml
deleted file mode 100644
index 8b8863e29c..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/serviceToDelete.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<service xmlns="http://org.openecomp.aai.inventory/v9">
-	<relationship-list>
-      <relationship>
-         <related-to>generic-vnf</related-to>
-         <related-link>/aai/v7/generic-vnf/vnfX</related-link>
-      </relationship>
-      <relationship>
-         <related-to>l3-network</related-to>
-         <related-link>/aai/v7/l3-network/netA</related-link>
-      </relationship>
-      <relationship>
-         <related-to>generic-vnf</related-to>
-         <related-link>/aai/v7/generic-vnf/vnfY/</related-link>
-      </relationship>
-      <relationship>
-         <related-to>l3-network</related-to>
-         <related-link>/aai/v7/l3-network/netB</related-link>
-      </relationship>
-      <relationship>
-         <related-to>l3-network</related-to>
-         <related-link>/aai/v7/l3-network/netC</related-link>
-      </relationship>
-      <relationship>
-         <related-to>allotted-resource</related-to>
-         <related-link>/aai/v11/anytxc</related-link>
-      </relationship>
-      <relationship>
-         <related-to>allotted-resource</related-to>
-         <related-link>/aai/v11/anybrg</related-link>
-      </relationship>
-      <relationship>
-         <related-to>allotted-resource</related-to>
-         <related-link>/aai/v11/other</related-link>
-      </relationship>
-   </relationship-list>
-</service>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/SDNCTopologyQueryCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/SDNCTopologyQueryCallback.xml
deleted file mode 100644
index d81b7e8f50..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/SDNCTopologyQueryCallback.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<output xmlns="org:onap:sdnctl:vnf">

-<brg-topology  xmlns="org:onap:sdnctl:vnf">

-    <ecomp-model-information>

-        <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>

-        <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>

-        <model-version>1.0</model-version>

-        <model-name>BRGmodelname</model-name>

-        <model-customization-uuid>013bd784-9bca-4919-ae2f-ae57af27bad9</model-customization-uuid>

-    </ecomp-model-information>

-    <allotted-resource-identifiers>

-        <parent-service-instance-id>parent-service-instance-id</parent-service-instance-id>

-        <consuming-service-intance-id>consuming-service-instance-id</consuming-service-intance-id>

-        <allotted-resource-name>namefromrequest</allotted-resource-name>

-        <allotted-resource-type>brg</allotted-resource-type>

-        <allotted-resource-id>allottedresourceidfromrequest</allotted-resource-id>

-    </allotted-resource-identifiers>

-    <brg-assignments>

-        <fq-name>fq-name</fq-name>

-        <dest-network>

-            <network-id>d1</network-id>

-            <network-role>drole</network-role>

-        </dest-network>

-        <vlan-tag>vlan-tag</vlan-tag>

-        <source-network>

-            <network-id>s2</network-id>

-            <network-role>srole</network-role>

-        </source-network>

-        <txc-id>txc-id</txc-id>

-        <txc-applied-service>

-            <service-instance-id>1</service-instance-id>

-            <vnf-id>123</vnf-id>

-            <txc-fqdn>a.b.c.d</txc-fqdn>

-        </txc-applied-service>

-    </brg-assignments>

-</brg-topology>

-

-</output>

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getAR.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getAR.xml
deleted file mode 100644
index e352ff8f1f..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getAR.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
-   <relationship-list>
-      <relationship>
-         <related-to>allotted-resource</related-to>
-         <related-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/allotted-resources/allotted-resource/arId-1</related-link>
-      </relationship>
-   </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getArBrg.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getArBrg.xml
deleted file mode 100644
index 8c3976b828..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getArBrg.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
-   <id>ar-1</id>
-   <orchestration-status>Active</orchestration-status>
-   <role>BRGr</role>
-   <type>BRGt</type>
-   <description>BRG</description>
-   <selflink/>
-   <resource-version>1490627351232</resource-version>
-   <relationship-list>
-      <relationship>
-         <related-to>service-instance</related-to>
-         <related-link>http://localhost:28090/aai/v9/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
-         <relationship-data>
-            <relationship-key>customer.global-customer-id</relationship-key>
-            <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
-         </relationship-data> 
-         <relationship-data>
-            <relationship-key>service-subscription.service-type</relationship-key>
-            <relationship-value>123456789</relationship-value>
-         </relationship-data>
-         <relationship-data>
-            <relationship-key>service-instance.service-instance-id</relationship-key>
-            <relationship-value>88819355-9a71-4ddc-9e22-373f0644b40b</relationship-value>
-         </relationship-data>
-         <related-to-property>
-            <property-key>service-instance.service-instance-name</property-key>
-            <property-value>vcpe-1702-m010904-name4</property-value>
-         </related-to-property>
-      </relationship>
-   </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getArBrg2.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getArBrg2.xml
deleted file mode 100644
index 650d608fb0..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getArBrg2.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
-   <id>ar-1</id>
-   <orchestration-status>Active</orchestration-status>
-   <role>txc</role>
-   <type>BRG</type>
-   <description>BRG</description>
-   <selflink/>
-   <resource-version>1490627351232</resource-version>
-   <relationship-list>
-      <relationship>
-         <related-to>service-instance</related-to>
-         <related-link>http://localhost:28090/aai/v9/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
-         <relationship-data>
-            <relationship-key>customer.global-customer-id</relationship-key>
-            <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
-         </relationship-data> 
-         <relationship-data>
-            <relationship-key>service-subscription.service-type</relationship-key>
-            <relationship-value>123456789</relationship-value>
-         </relationship-data>
-         <relationship-data>
-            <relationship-key>service-instance.service-instance-id</relationship-key>
-            <relationship-value>88819355-9a71-4ddc-9e22-373f0644b40b</relationship-value>
-         </relationship-data>
-         <related-to-property>
-            <property-key>service-instance.service-instance-name</property-key>
-            <property-value>vcpe-1702-m010904-name4</property-value>
-         </related-to-property>
-      </relationship>
-   </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getSIandAR.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getSIandAR.xml
deleted file mode 100644
index 14c7410995..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getSIandAR.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<service-instance>
-    <service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>
-    <resource-version>123456789</resource-version>
-    
-    <orchestration-status>Active</orchestration-status>
-    
-    <relationship-list>
-      <relationship>
-         <related-to>allotted-resource</related-to>
-         <related-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/allotted-resources/allotted-resource/arId-1</related-link>
-      </relationship>
-      
-      <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>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml
deleted file mode 100644
index 8ed991608a..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
-   <id>ar-1</id>
-   <orchestration-status>Active</orchestration-status>
-   <role>BRG</role>
-   <type>BRG</type>
-   <description>BRG</description>
-   <selflink/>
-   <resource-version>1490627351232</resource-version>
-   <relationship-list>
-      <relationship>
-         <related-to>service-instance</related-to>
-         <related-link>http://localhost:28090/aai/v9/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
-         <relationship-data>
-            <relationship-key>customer.global-customer-id</relationship-key>
-            <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
-         </relationship-data> 
-         <relationship-data>
-            <relationship-key>service-subscription.service-type</relationship-key>
-            <relationship-value>123456789</relationship-value>
-         </relationship-data>
-         <relationship-data>
-            <relationship-key>service-instance.service-instance-id</relationship-key>
-            <relationship-value>88819355-9a71-4ddc-9e22-373f0644b40b</relationship-value>
-         </relationship-data>
-         <related-to-property>
-            <property-key>service-instance.service-instance-name</property-key>
-            <property-value>vcpe-1702-m010904-name4</property-value>
-         </related-to-property>
-      </relationship>
-   </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncActivateRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncActivateRollbackReq.xml
deleted file mode 100644
index 6f86e0fb86..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncActivateRollbackReq.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
-                xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
-                xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
-	<sdncadapter:RequestHeader>
-        <sdncadapter:RequestId>b043d290-140d-4a38-a9b6-95d3b8bd27d1</sdncadapter:RequestId>
-        <sdncadapter:SvcInstanceId>MIS%252F1604%252F0026%252FSW_INTERNET</sdncadapter:SvcInstanceId>
-        <sdncadapter:SvcAction>deactvate</sdncadapter:SvcAction>
-        <sdncadapter:SvcOperation>brg-topology-operation</sdncadapter:SvcOperation>
-        <sdncadapter:CallbackUrl>http://localhost:28090/mso/SDNCAdapterCallbackService</sdncadapter:CallbackUrl>
-	</sdncadapter:RequestHeader>
-	<sdncadapterworkflow:SDNCRequestData>
-	<request-information>
-	<request-id>RaaTestRequestId1</request-id>
-	<request-action>DeleteBRGInstance</request-action>
-	<source>MSO</source>
-	<notification-url/>
-	<order-number/>
-	<order-version/>
-	</request-information>
-	<service-information>
-	<service-id></service-id>
-	<subscription-service-type></subscription-service-type>
-	<ecomp-model-information></ecomp-model-information>
-	<service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
-	<subscriber-name/>
-	<global-customer-id></global-customer-id>
-	</service-information>
-	<allotted-resource-information>
-	<allotted-resource-id>arId-1</allotted-resource-id>
-	<allotted-resource-type>brg</allotted-resource-type>
-	<parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
-	<ecomp-model-information>
-        <model-invariant-uuid></model-invariant-uuid>
-        <model-uuid></model-uuid>
-        <model-customization-uuid></model-customization-uuid>
-        <model-version></model-version>
-        <model-name></model-name>
-	</ecomp-model-information>
-	</allotted-resource-information>
-	<brg-request-input>
-	<source-network>
-        <network-id>${sourceNetworkId}</network-id>
-        <network-role>${sourceNetworkRole}</network-role>
-	</source-network>
-	<dest-network>
-        <network-id/>
-        <network-role></network-role>
-	</dest-network>
-	</brg-request-input>
-	</sdncadapterworkflow:SDNCRequestData>
-</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncAssignRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncAssignRollbackReq.xml
deleted file mode 100644
index 30d4c7ae49..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncAssignRollbackReq.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
-                xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
-                xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
-	<sdncadapter:RequestHeader>
-        <sdncadapter:RequestId>b043d290-140d-4a38-a9b6-95d3b8bd27d3</sdncadapter:RequestId>
-        <sdncadapter:SvcInstanceId>MIS%252F1604%252F0026%252FSW_INTERNET</sdncadapter:SvcInstanceId>
-        <sdncadapter:SvcAction>unassign</sdncadapter:SvcAction>
-        <sdncadapter:SvcOperation>brg-topology-operation</sdncadapter:SvcOperation>
-        <sdncadapter:CallbackUrl>http://localhost:28090/mso/SDNCAdapterCallbackService</sdncadapter:CallbackUrl>
-	</sdncadapter:RequestHeader>
-	<sdncadapterworkflow:SDNCRequestData>
-	<request-information>
-	<request-id>RaaTestRequestId1</request-id>
-	<request-action>DeleteBRGInstance</request-action>
-	<source>MSO</source>
-	<notification-url/>
-	<order-number/>
-	<order-version/>
-	</request-information>
-	<service-information>
-	<service-id></service-id>
-	<subscription-service-type></subscription-service-type>
-	<ecomp-model-information></ecomp-model-information>
-	<service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
-	<subscriber-name/>
-	<global-customer-id></global-customer-id>
-	</service-information>
-	<allotted-resource-information>
-	<allotted-resource-id>arId-1</allotted-resource-id>
-	<allotted-resource-type>brg</allotted-resource-type>
-	<parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
-	<ecomp-model-information>
-        <model-invariant-uuid></model-invariant-uuid>
-        <model-uuid></model-uuid>
-        <model-customization-uuid></model-customization-uuid>
-        <model-version></model-version>
-        <model-name></model-name>
-	</ecomp-model-information>
-	</allotted-resource-information>
-	<brg-request-input>
-	<source-network>
-        <network-id>${sourceNetworkId}</network-id>
-        <network-role>${sourceNetworkRole}</network-role>
-	</source-network>
-	<dest-network>
-        <network-id/>
-        <network-role></network-role>
-	</dest-network>
-	</brg-request-input>
-	</sdncadapterworkflow:SDNCRequestData>
-</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncCreateRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncCreateRollbackReq.xml
deleted file mode 100644
index e20850a7b9..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncCreateRollbackReq.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
-                xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
-                xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
-	<sdncadapter:RequestHeader>
-        <sdncadapter:RequestId>b043d290-140d-4a38-a9b6-95d3b8bd27d2</sdncadapter:RequestId>
-        <sdncadapter:SvcInstanceId>MIS%252F1604%252F0026%252FSW_INTERNET</sdncadapter:SvcInstanceId>
-        <sdncadapter:SvcAction>delete</sdncadapter:SvcAction>
-        <sdncadapter:SvcOperation>brg-topology-operation</sdncadapter:SvcOperation>
-        <sdncadapter:CallbackUrl>http://localhost:28090/mso/SDNCAdapterCallbackService</sdncadapter:CallbackUrl>
-	</sdncadapter:RequestHeader>
-	<sdncadapterworkflow:SDNCRequestData>
-	<request-information>
-	<request-id>RaaTestRequestId1</request-id>
-	<request-action>DeleteBRGInstance</request-action>
-	<source>MSO</source>
-	<notification-url/>
-	<order-number/>
-	<order-version/>
-	</request-information>
-	<service-information>
-	<service-id></service-id>
-	<subscription-service-type></subscription-service-type>
-	<ecomp-model-information></ecomp-model-information>
-	<service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
-	<subscriber-name/>
-	<global-customer-id></global-customer-id>
-	</service-information>
-	<allotted-resource-information>
-	<allotted-resource-id>arId-1</allotted-resource-id>
-	<allotted-resource-type>brg</allotted-resource-type>
-	<parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
-	<ecomp-model-information>
-        <model-invariant-uuid></model-invariant-uuid>
-        <model-uuid></model-uuid>
-        <model-customization-uuid></model-customization-uuid>
-        <model-version></model-version>
-        <model-name></model-name>
-	</ecomp-model-information>
-	</allotted-resource-information>
-	<brg-request-input>
-	<source-network>
-        <network-id>${sourceNetworkId}</network-id>
-        <network-role>${sourceNetworkRole}</network-role>
-	</source-network>
-	<dest-network>
-        <network-id/>
-        <network-role></network-role>
-	</dest-network>
-	</brg-request-input>
-	</sdncadapterworkflow:SDNCRequestData>
-</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml
deleted file mode 100644
index f74e51e9d5..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<output xmlns="org:onap:sdnctl:vnf">

-<tunnelxconn-topology  xmlns="org:onap:sdnctl:vnf">

-    <ecomp-model-information>

-        <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>

-        <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>

-        <model-version>1.0</model-version>

-        <model-name>TXCmodelname</model-name>

-        <model-customization-uuid>013bd784-9bca-4919-ae2f-ae57af27bad9</model-customization-uuid>

-    </ecomp-model-information>

-    <allotted-resource-identifiers>

-        <parent-service-instance-id>parent-service-instance-id</parent-service-instance-id>

-        <consuming-service-intance-id>consuming-service-instance-id</consuming-service-intance-id>

-        <allotted-resource-name>namefromrequest</allotted-resource-name>

-        <allotted-resource-type>tunnelxconn</allotted-resource-type>

-        <allotted-resource-id>allottedresourceidfromrequest</allotted-resource-id>

-    </allotted-resource-identifiers>

-    <tunnelxconn-assignments>

-    	<vni>my-vni</vni>

-    	<vgmux-bearer-ip>my-bearer-ip</vgmux-bearer-ip>

-    	<vgmux-lan-ip>my-lan-ip</vgmux-lan-ip>

-    </tunnelxconn-assignments>

-</tunnelxconn-topology>

-

-</output>

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getAR.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getAR.xml
deleted file mode 100644
index e352ff8f1f..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getAR.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
-   <relationship-list>
-      <relationship>
-         <related-to>allotted-resource</related-to>
-         <related-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/allotted-resources/allotted-resource/arId-1</related-link>
-      </relationship>
-   </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getArTxc.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getArTxc.xml
deleted file mode 100644
index dfb7d46a68..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getArTxc.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
-   <id>ar-1</id>
-   <orchestration-status>Active</orchestration-status>
-   <role>TXCr</role>
-   <type>TXCt</type>
-   <description>TXC</description>
-   <selflink/>
-   <resource-version>1490627351232</resource-version>
-   <relationship-list>
-      <relationship>
-         <related-to>service-instance</related-to>
-         <related-link>http://localhost:28090/aai/v9/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
-         <relationship-data>
-            <relationship-key>customer.global-customer-id</relationship-key>
-            <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
-         </relationship-data> 
-         <relationship-data>
-            <relationship-key>service-subscription.service-type</relationship-key>
-            <relationship-value>123456789</relationship-value>
-         </relationship-data>
-         <relationship-data>
-            <relationship-key>service-instance.service-instance-id</relationship-key>
-            <relationship-value>88819355-9a71-4ddc-9e22-373f0644b40b</relationship-value>
-         </relationship-data>
-         <related-to-property>
-            <property-key>service-instance.service-instance-name</property-key>
-            <property-value>vcpe-1702-m010904-name4</property-value>
-         </related-to-property>
-      </relationship>
-   </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getArTxc2.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getArTxc2.xml
deleted file mode 100644
index 59c503036a..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getArTxc2.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
-   <id>ar-1</id>
-   <orchestration-status>Active</orchestration-status>
-   <role>brg</role>
-   <type>TXC</type>
-   <description>TXC</description>
-   <selflink/>
-   <resource-version>1490627351232</resource-version>
-   <relationship-list>
-      <relationship>
-         <related-to>service-instance</related-to>
-         <related-link>http://localhost:28090/aai/v9/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
-         <relationship-data>
-            <relationship-key>customer.global-customer-id</relationship-key>
-            <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
-         </relationship-data> 
-         <relationship-data>
-            <relationship-key>service-subscription.service-type</relationship-key>
-            <relationship-value>123456789</relationship-value>
-         </relationship-data>
-         <relationship-data>
-            <relationship-key>service-instance.service-instance-id</relationship-key>
-            <relationship-value>88819355-9a71-4ddc-9e22-373f0644b40b</relationship-value>
-         </relationship-data>
-         <related-to-property>
-            <property-key>service-instance.service-instance-name</property-key>
-            <property-value>vcpe-1702-m010904-name4</property-value>
-         </related-to-property>
-      </relationship>
-   </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getSIandAR.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getSIandAR.xml
deleted file mode 100644
index 14c7410995..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getSIandAR.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<service-instance>
-    <service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>
-    <resource-version>123456789</resource-version>
-    
-    <orchestration-status>Active</orchestration-status>
-    
-    <relationship-list>
-      <relationship>
-         <related-to>allotted-resource</related-to>
-         <related-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/allotted-resources/allotted-resource/arId-1</related-link>
-      </relationship>
-      
-      <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>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml
deleted file mode 100644
index f2063442d6..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
-   <id>ar-1</id>
-   <orchestration-status>Active</orchestration-status>
-   <role>Tunnel XConn</role>
-   <type>Tunnel XConn</type>
-   <description>Tunnel XConn</description>
-   <selflink/>
-   <resource-version>1490627351232</resource-version>
-   <relationship-list>
-      <relationship>
-         <related-to>service-instance</related-to>
-         <related-link>http://localhost:28090/aai/v9/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
-         <relationship-data>
-            <relationship-key>customer.global-customer-id</relationship-key>
-            <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
-         </relationship-data> 
-         <relationship-data>
-            <relationship-key>service-subscription.service-type</relationship-key>
-            <relationship-value>123456789</relationship-value>
-         </relationship-data>
-         <relationship-data>
-            <relationship-key>service-instance.service-instance-id</relationship-key>
-            <relationship-value>88819355-9a71-4ddc-9e22-373f0644b40b</relationship-value>
-         </relationship-data>
-         <related-to-property>
-            <property-key>service-instance.service-instance-name</property-key>
-            <property-value>vcpe-1702-m010904-name4</property-value>
-         </related-to-property>
-      </relationship>
-   </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncActivateRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncActivateRollbackReq.xml
deleted file mode 100644
index efec7eb001..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncActivateRollbackReq.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
-                xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
-                xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
-	<sdncadapter:RequestHeader>
-        <sdncadapter:RequestId>b043d290-140d-4a38-a9b6-95d3b8bd27d1</sdncadapter:RequestId>
-        <sdncadapter:SvcInstanceId>MIS%252F1604%252F0026%252FSW_INTERNET</sdncadapter:SvcInstanceId>
-        <sdncadapter:SvcAction>deactvate</sdncadapter:SvcAction>
-        <sdncadapter:SvcOperation>tunnelxconn-topology-operation</sdncadapter:SvcOperation>
-        <sdncadapter:CallbackUrl>http://localhost:8080/mso/SDNCAdapterCallbackService</sdncadapter:CallbackUrl>
-	</sdncadapter:RequestHeader>
-	<sdncadapterworkflow:SDNCRequestData>
-	<request-information>
-	<request-id>RaaTestRequestId1</request-id>
-	<request-action>DeleteTunnelXConnInstance</request-action>
-	<source>MSO</source>
-	<notification-url/>
-	<order-number/>
-	<order-version/>
-	</request-information>
-	<service-information>
-	<service-id></service-id>
-	<subscription-service-type></subscription-service-type>
-	<ecomp-model-information></ecomp-model-information>
-	<service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
-	<subscriber-name/>
-	<global-customer-id></global-customer-id>
-	</service-information>
-	<allotted-resource-information>
-	<allotted-resource-id>arId-1</allotted-resource-id>
-	<allotted-resource-type>tunnelxconn</allotted-resource-type>
-	<parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
-	<ecomp-model-information>
-        <model-invariant-uuid></model-invariant-uuid>
-        <model-uuid></model-uuid>
-        <model-customization-uuid></model-customization-uuid>
-        <model-version></model-version>
-        <model-name></model-name>
-	</ecomp-model-information>
-	</allotted-resource-information>
-	<tunnelxconn-request-input>
-	<source-network>
-        <network-id>${sourceNetworkId}</network-id>
-        <network-role>${sourceNetworkRole}</network-role>
-	</source-network>
-	<dest-network>
-        <network-id/>
-        <network-role></network-role>
-	</dest-network>
-	</tunnelxconn-request-input>
-	</sdncadapterworkflow:SDNCRequestData>
-</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncAssignRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncAssignRollbackReq.xml
deleted file mode 100644
index 9f52758750..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncAssignRollbackReq.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
-                xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
-                xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
-	<sdncadapter:RequestHeader>
-        <sdncadapter:RequestId>b043d290-140d-4a38-a9b6-95d3b8bd27d3</sdncadapter:RequestId>
-        <sdncadapter:SvcInstanceId>MIS%252F1604%252F0026%252FSW_INTERNET</sdncadapter:SvcInstanceId>
-        <sdncadapter:SvcAction>unassign</sdncadapter:SvcAction>
-        <sdncadapter:SvcOperation>tunnelxconn-topology-operation</sdncadapter:SvcOperation>
-        <sdncadapter:CallbackUrl>http://localhost:8080/mso/SDNCAdapterCallbackService</sdncadapter:CallbackUrl>
-	</sdncadapter:RequestHeader>
-	<sdncadapterworkflow:SDNCRequestData>
-	<request-information>
-	<request-id>RaaTestRequestId1</request-id>
-	<request-action>DeleteTunnelXConnInstance</request-action>
-	<source>MSO</source>
-	<notification-url/>
-	<order-number/>
-	<order-version/>
-	</request-information>
-	<service-information>
-	<service-id></service-id>
-	<subscription-service-type></subscription-service-type>
-	<ecomp-model-information></ecomp-model-information>
-	<service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
-	<subscriber-name/>
-	<global-customer-id></global-customer-id>
-	</service-information>
-	<allotted-resource-information>
-	<allotted-resource-id>arId-1</allotted-resource-id>
-	<allotted-resource-type>tunnelxconn</allotted-resource-type>
-	<parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
-	<ecomp-model-information>
-        <model-invariant-uuid></model-invariant-uuid>
-        <model-uuid></model-uuid>
-        <model-customization-uuid></model-customization-uuid>
-        <model-version></model-version>
-        <model-name></model-name>
-	</ecomp-model-information>
-	</allotted-resource-information>
-	<tunnelxconn-request-input>
-	<source-network>
-        <network-id>${sourceNetworkId}</network-id>
-        <network-role>${sourceNetworkRole}</network-role>
-	</source-network>
-	<dest-network>
-        <network-id/>
-        <network-role></network-role>
-	</dest-network>
-	</tunnelxconn-request-input>
-	</sdncadapterworkflow:SDNCRequestData>
-</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncCreateRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncCreateRollbackReq.xml
deleted file mode 100644
index 025195e326..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncCreateRollbackReq.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
-                xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
-                xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
-	<sdncadapter:RequestHeader>
-        <sdncadapter:RequestId>b043d290-140d-4a38-a9b6-95d3b8bd27d2</sdncadapter:RequestId>
-        <sdncadapter:SvcInstanceId>MIS%252F1604%252F0026%252FSW_INTERNET</sdncadapter:SvcInstanceId>
-        <sdncadapter:SvcAction>delete</sdncadapter:SvcAction>
-        <sdncadapter:SvcOperation>tunnelxconn-topology-operation</sdncadapter:SvcOperation>
-        <sdncadapter:CallbackUrl>http://localhost:8080/mso/SDNCAdapterCallbackService</sdncadapter:CallbackUrl>
-	</sdncadapter:RequestHeader>
-	<sdncadapterworkflow:SDNCRequestData>
-	<request-information>
-	<request-id>RaaTestRequestId1</request-id>
-	<request-action>DeleteTunnelXConnInstance</request-action>
-	<source>MSO</source>
-	<notification-url/>
-	<order-number/>
-	<order-version/>
-	</request-information>
-	<service-information>
-	<service-id></service-id>
-	<subscription-service-type></subscription-service-type>
-	<ecomp-model-information></ecomp-model-information>
-	<service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
-	<subscriber-name/>
-	<global-customer-id></global-customer-id>
-	</service-information>
-	<allotted-resource-information>
-	<allotted-resource-id>arId-1</allotted-resource-id>
-	<allotted-resource-type>tunnelxconn</allotted-resource-type>
-	<parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
-	<ecomp-model-information>
-        <model-invariant-uuid></model-invariant-uuid>
-        <model-uuid></model-uuid>
-        <model-customization-uuid></model-customization-uuid>
-        <model-version></model-version>
-        <model-name></model-name>
-	</ecomp-model-information>
-	</allotted-resource-information>
-	<tunnelxconn-request-input>
-	<source-network>
-        <network-id>${sourceNetworkId}</network-id>
-        <network-role>${sourceNetworkRole}</network-role>
-	</source-network>
-	<dest-network>
-        <network-id/>
-        <network-role></network-role>
-	</dest-network>
-	</tunnelxconn-request-input>
-	</sdncadapterworkflow:SDNCRequestData>
-</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoDeleteAllottedResourceBRG/arGetById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoDeleteAllottedResourceBRG/arGetById.xml
deleted file mode 100644
index 8ed991608a..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoDeleteAllottedResourceBRG/arGetById.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
-   <id>ar-1</id>
-   <orchestration-status>Active</orchestration-status>
-   <role>BRG</role>
-   <type>BRG</type>
-   <description>BRG</description>
-   <selflink/>
-   <resource-version>1490627351232</resource-version>
-   <relationship-list>
-      <relationship>
-         <related-to>service-instance</related-to>
-         <related-link>http://localhost:28090/aai/v9/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
-         <relationship-data>
-            <relationship-key>customer.global-customer-id</relationship-key>
-            <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
-         </relationship-data> 
-         <relationship-data>
-            <relationship-key>service-subscription.service-type</relationship-key>
-            <relationship-value>123456789</relationship-value>
-         </relationship-data>
-         <relationship-data>
-            <relationship-key>service-instance.service-instance-id</relationship-key>
-            <relationship-value>88819355-9a71-4ddc-9e22-373f0644b40b</relationship-value>
-         </relationship-data>
-         <related-to-property>
-            <property-key>service-instance.service-instance-name</property-key>
-            <property-value>vcpe-1702-m010904-name4</property-value>
-         </related-to-property>
-      </relationship>
-   </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoDeleteAllottedResourceTXC/arGetById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoDeleteAllottedResourceTXC/arGetById.xml
deleted file mode 100644
index f2063442d6..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoDeleteAllottedResourceTXC/arGetById.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
-   <id>ar-1</id>
-   <orchestration-status>Active</orchestration-status>
-   <role>Tunnel XConn</role>
-   <type>Tunnel XConn</type>
-   <description>Tunnel XConn</description>
-   <selflink/>
-   <resource-version>1490627351232</resource-version>
-   <relationship-list>
-      <relationship>
-         <related-to>service-instance</related-to>
-         <related-link>http://localhost:28090/aai/v9/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
-         <relationship-data>
-            <relationship-key>customer.global-customer-id</relationship-key>
-            <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
-         </relationship-data> 
-         <relationship-data>
-            <relationship-key>service-subscription.service-type</relationship-key>
-            <relationship-value>123456789</relationship-value>
-         </relationship-data>
-         <relationship-data>
-            <relationship-key>service-instance.service-instance-id</relationship-key>
-            <relationship-value>88819355-9a71-4ddc-9e22-373f0644b40b</relationship-value>
-         </relationship-data>
-         <related-to-property>
-            <property-key>service-instance.service-instance-name</property-key>
-            <property-value>vcpe-1702-m010904-name4</property-value>
-         </related-to-property>
-      </relationship>
-   </relationship-list>
-</allotted-resource>