46 files changed, 0 insertions, 3284 deletions
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/assignments/alltype-empty-value-mapping.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/assignments/alltype-empty-value-mapping.json
deleted file mode 100644
index a3d65927b..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/assignments/alltype-empty-value-mapping.json
+++ /dev/null
@@ -1,86 +0,0 @@
-[
-	{
-		"name": "vnf-id-string",
-		"property": {
-			"required": true,
-			"type": "string"
-		},
-		"input-param": true,
-		"dictionary-name": "vnf-id-string",
-		"dictionary-source": "input",
-		"version": 0,
-		"status": "success",
-		"updated-by": "System"
-	},
-	{
-		"name": "vnf-id-integer",
-		"property": {
-			"required": true,
-			"type": "integer"
-		},
-		"input-param": true,
-		"dictionary-name": "vnf-id-integer",
-		"dictionary-source": "input",
-		"version": 0,
-		"status": "success",
-		"updated-by": "System"
-	},
-	{
-		"name": "vnf-boolean",
-		"property": {
-			"required": true,
-			"type": "boolean"
-		},
-		"input-param": true,
-		"dictionary-name": "vnf-boolean",
-		"dictionary-source": "input",
-		"version": 0,
-		"status": "success",
-		"updated-by": "System"
-	},
-	{
-		"name": "vnf-complex",
-		"property": {
-			"required": true,
-			"type": "dt-complex"
-		},
-		"input-param": true,
-		"dictionary-name": "vnf-complex",
-		"dictionary-source": "input",
-		"version": 0,
-		"status": "success",
-		"updated-by": "System"
-	},
-	{
-		"name": "vnf-id-array",
-		"property": {
-			"required": true,
-			"type": "list",
-			"entry_schema": {
-				"type": "string"
-			}
-		},
-		"input-param": true,
-		"dictionary-name": "vnf-id-array",
-		"dictionary-source": "input",
-		"version": 0,
-		"status": "success",
-		"updated-by": "System"
-	},
-	{
-		"name": "vnf-array-complex",
-		"property": {
-			"required": true,
-			"type": "list",
-			"entry_schema": {
-				"type": "dt-complex"
-			}
-		},
-		"input-param": true,
-		"dictionary-name": "vnf-array-complex",
-		"dictionary-source": "input",
-		"version": 0,
-		"status": "success",
-		"updated-by": "System"
-	}
-]
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/assignments/alltype-mapping.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/assignments/alltype-mapping.json
deleted file mode 100644
index 36909da99..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/assignments/alltype-mapping.json
+++ /dev/null
@@ -1,110 +0,0 @@
-[
-	{
-		"name": "vnf-id-string",
-		"property": {
-			"required": true,
-			"type": "string",
-			"value": "123456"
-		},
-		"input-param": true,
-		"dictionary-name": "vnf-id-string",
-		"dictionary-source": "input",
-		"version": 0,
-		"status": "success",
-		"updated-by": "System"
-	},
-	{
-		"name": "vnf-id-integer",
-		"property": {
-			"required": true,
-			"type": "integer",
-			"value": 123456
-		},
-		"input-param": true,
-		"dictionary-name": "vnf-id-integer",
-		"dictionary-source": "input",
-		"version": 0,
-		"status": "success",
-		"updated-by": "System"
-	},
-	{
-		"name": "vnf-boolean",
-		"property": {
-			"required": true,
-			"type": "boolean",
-			"value": true
-		},
-		"input-param": true,
-		"dictionary-name": "vnf-boolean",
-		"dictionary-source": "input",
-		"version": 0,
-		"status": "success",
-		"updated-by": "System"
-	},
-	{
-		"name": "vnf-complex",
-		"property": {
-			"required": true,
-			"type": "dt-complex",
-			"value": {
-				"name": "Brinda",
-				"location": "Madurai",
-				"count": 2
-			}
-		},
-		"input-param": true,
-		"dictionary-name": "vnf-complex",
-		"dictionary-source": "input",
-		"version": 0,
-		"status": "success",
-		"updated-by": "System"
-	},
-	{
-		"name": "vnf-id-array",
-		"property": {
-			"required": true,
-			"type": "list",
-			"entry_schema": {
-				"type": "string"
-			},
-			"value": [
-				"A",
-				"B",
-				"C"
-			]
-		},
-		"input-param": true,
-		"dictionary-name": "vnf-id-array",
-		"dictionary-source": "input",
-		"version": 0,
-		"status": "success",
-		"updated-by": "System"
-	},
-	{
-		"name": "vnf-array-complex",
-		"property": {
-			"required": true,
-			"type": "list",
-			"entry_schema": {
-				"type": "dt-complex"
-			},
-			"value": [
-				{
-					"name": "A"
-				},
-				{
-					"name": "B"
-				},
-				{
-					"name": "C"
-				}
-			]
-		},
-		"input-param": true,
-		"dictionary-name": "vnf-array-complex",
-		"dictionary-source": "input",
-		"version": 0,
-		"status": "success",
-		"updated-by": "System"
-	}
-]
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/assignments/empty-dictionary.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/assignments/empty-dictionary.json
deleted file mode 100644
index 0637a088a..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/assignments/empty-dictionary.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
-\ No newline at end of file
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/array-complex-response.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/array-complex-response.json
deleted file mode 100644
index 2dfe89e29..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/array-complex-response.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"locations": [
-		{
-			"mdsal-country": "US",
-			"mdsal-state": "NJ"
-		},
-		{
-			"mdsal-country": "INDIA",
-			"mdsal-state": "TN"
-		}
-	]
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/array-complex-v4-assigned-response.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/array-complex-v4-assigned-response.json
deleted file mode 100644
index d7c5546c1..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/array-complex-v4-assigned-response.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"v4-assigned-ip-list": [
-		{
-			"v4-ip-type": "NMLAN",
-			"ipv4-gateway-prefix": "10.66.1.129",
-			"v4-ip-prefix": "10.66.1.152",
-			"v4-ip-prefix-length": 32,
-			"ip-count": 1,
-			"v4-ip-source": "EIPAM",
-			"client-key": "ADIG_19_vnf_name061rej01"
-		}
-	]
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/complex-response.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/complex-response.json
deleted file mode 100644
index 1a36100fd..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/complex-response.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"locations": {
-		"mdsal-country": "US",
-		"mdsal-state": "NJ"
-	}
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/default-pointer.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/default-pointer.json
deleted file mode 100644
index 47edb1881..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/default-pointer.json
+++ /dev/null
@@ -1,166 +0,0 @@
-{
-	"vnf-topology-information": {
-		"vnf-assignments": {
-			"availability-zones": [
-				{
-					"availability-zone": "frkde-esx-az01"
-				}
-			],
-			"vnf-vms": [
-				{
-					"vm-type": "vre",
-					"vm-count": 1,
-					"vm-networks": [
-						{
-							"network-role": "ADIGOam.OAM",
-							"network-name": "ADIGOAM.OAM",
-							"v4-assigned-ip-list": [
-								{
-									"v4-ip-type": "NMLAN",
-									"ipv4-gateway-prefix": "10.66.1.129",
-									"v4-ip-prefix": "10.66.1.152",
-									"v4-ip-prefix-length": 32,
-									"ip-count": 1,
-									"v4-ip-source": "EIPAM",
-									"client-key": "ADIG_19_vnf_name061rej01"
-								}
-							],
-							"network-id": "VPEADIG1d77c-1086-41ec-b7f3-94bb30936807"
-						},
-						{
-							"network-role": "Internal-Network",
-							"network-name": "VMX-INTTERNAL056",
-							"v4-assigned-ip-list": [
-								{
-									"v4-ip-type": "INTERNAL",
-									"v4-ip-prefix": "128.0.0.1",
-									"ipv4-prefix-block": "128.0.0.0",
-									"v4-ip-prefix-length": 24,
-									"v4-ip-source": "OTHER"
-								}
-							],
-							"network-forwarding": "l2",
-							"network-id": "VMX-INT1"
-						}
-					],
-					"vm-names": [
-						{
-							"vm-name": "ADIG_19_vnf_name061rej",
-							"vm-uuid": "50d2032d-fe15-4e82-94f3-8b73c566a345"
-						}
-					]
-				},
-				{
-					"vm-type": "vpfe",
-					"vm-count": 1,
-					"vm-networks": [
-						{
-							"network-role": "ADIG_SRIOV_3",
-							"network-name": "ADIG_SRIOV_3",
-							"multicast-allow": true,
-							"broadcast-allow": true,
-							"network-id": "VPEADIG1d77c-1086-41ec-b7f3-94bb30936810",
-							"vlan-filter": "[4013,4014]",
-							"network-macs": [
-								{
-									"mac-address": "dc:38:e1:69:bf:5f"
-								}
-							],
-							"vlan-strip": false,
-							"unicast-allow": true
-						},
-						{
-							"network-role": "ADIG_SRIOV_4",
-							"network-name": "ADIG_SRIOV_4",
-							"multicast-allow": true,
-							"broadcast-allow": true,
-							"network-id": "VPEADIG1d77c-1086-41ec-b7f3-94bb30936811",
-							"vlan-filter": "[4013,4014]",
-							"network-macs": [
-								{
-									"mac-address": "dc:38:e1:69:bf:5f"
-								}
-							],
-							"vlan-strip": false,
-							"unicast-allow": true
-						},
-						{
-							"network-role": "ADIG_SRIOV_1",
-							"network-name": "ADIG_SRIOV_1",
-							"multicast-allow": true,
-							"broadcast-allow": true,
-							"network-id": "VPEADIG1d77c-1086-41ec-b7f3-94bb30936808",
-							"vlan-filter": "[4013,4014]",
-							"network-macs": [
-								{
-									"mac-address": "dc:38:e1:69:bf:5f"
-								}
-							],
-							"vlan-strip": false,
-							"unicast-allow": true
-						},
-						{
-							"network-role": "ADIG_SRIOV_2",
-							"network-name": "ADIG_SRIOV_2",
-							"multicast-allow": true,
-							"broadcast-allow": true,
-							"network-id": "VPEADIG1d77c-1086-41ec-b7f3-94bb30936809",
-							"vlan-filter": "[4013,4014]",
-							"network-macs": [
-								{
-									"mac-address": "dc:38:e1:69:bf:5f"
-								}
-							],
-							"vlan-strip": false,
-							"unicast-allow": true
-						},
-						{
-							"network-role": "Internal-Network",
-							"network-name": "VMX-INTTERNAL056",
-							"v4-assigned-ip-list": [
-								{
-									"v4-ip-type": "INTERNAL",
-									"v4-ip-prefix": "128.0.0.16",
-									"ipv4-prefix-block": "128.0.0.0",
-									"v4-ip-prefix-length": 24,
-									"v4-ip-source": "OTHER"
-								}
-							],
-							"network-forwarding": "l2",
-							"network-id": "VMX-INT1"
-						}
-					],
-					"vm-names": [
-						{
-							"vm-name": "ADIG_19_vnf_name056fej",
-							"vm-uuid": "d2ce6023-a3ab-412e-bc63-360307aac165"
-						}
-					]
-				}
-			],
-			"vnf-status": "Deactivated",
-			"vnf-networks": [
-				{
-					"network-role": "ADIGOam.OAM",
-					"network-id": "VPEADIG1d77c-1086-41ec-b7f3-94bb30936807"
-				},
-				{
-					"network-role": "ADIG_SRIOV_3",
-					"network-id": "VPEADIG1d77c-1086-41ec-b7f3-94bb30936810"
-				},
-				{
-					"network-role": "ADIG_SRIOV_2",
-					"network-id": "VPEADIG1d77c-1086-41ec-b7f3-94bb30936809"
-				},
-				{
-					"network-role": "ADIG_SRIOV_4",
-					"network-id": "VPEADIG1d77c-1086-41ec-b7f3-94bb30936811"
-				},
-				{
-					"network-role": "ADIG_SRIOV_1",
-					"network-id": "VPEADIG1d77c-1086-41ec-b7f3-94bb30936808"
-				}
-			]
-		}
-	}
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/dt-location.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/dt-location.json
deleted file mode 100644
index 52e0a7967..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/dt-location.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"version": "1.0.0",
-	"description": "test Data Type",
-	"properties": {
-		"country": {
-			"required": true,
-			"type": "string"
-		},
-		"state": {
-			"required": false,
-			"type": "string"
-		}
-	},
-	"derived_from": "tosca.datatypes.Root"
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/dt-v4-assigned-ip-list.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/dt-v4-assigned-ip-list.json
deleted file mode 100644
index bc8f1d2c2..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/dt-v4-assigned-ip-list.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"version": "1.0.0",
-	"description": "This is dt-v4-assigned-ip-list Data Type",
-	"properties": {
-		"v4-ip-type": {
-			"required": true,
-			"type": "string"
-		},
-		"ipv4-gateway-prefix": {
-			"required": true,
-			"type": "string"
-		},
-		"v4-ip-prefix": {
-			"required": true,
-			"type": "string"
-		},
-		"v4-ip-prefix-length": {
-			"required": true,
-			"type": "string"
-		},
-		"v4-ip-source": {
-			"required": true,
-			"type": "string"
-		}
-	},
-	"derived_from": "tosca.datatypes.Root"
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/mdsal-array-v4iplist.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/mdsal-array-v4iplist.json
deleted file mode 100644
index 387a5ad2d..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/mdsal-array-v4iplist.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-	"v4-ip-prefix": {
-		"name": "v4-ip-prefix",
-		"property": {
-			"type": "string"
-		},
-		"sources": {
-			"mdsal": {
-				"type": "source-mdsal",
-				"properties": {
-					"url-path": "/restconf/config/L3VNF-API:services/service-list/$service-instance-id/service-data/vnf-topology-information/vnf-assignments/vnf-vms/$oam-ipv4-ip-type/vm-networks/$oam-network-role/v4-assigned-ip-list/$oam-vm-type",
-					"path": "/v4-assigned-ip-list/0/v4-ip-prefix",
-					"input-key-mapping": {
-						"service-instance-id": "service-instance-id",
-						"oam-network-role": "oam-network-role",
-						"oam-ipv4-ip-type": "oam-ipv4-ip-type",
-						"oam-vm-type": "oam-vm-type"
-					},
-					"output-key-mapping": {
-						"v4-ip-prefix": "v4-ip-prefix"
-					},
-					"key-dependencies": [
-						"service-instance-id",
-						"oam-network-role",
-						"oam-ipv4-ip-type",
-						"oam-vm-type"
-					]
-				}
-			}
-		}
-	},
-	"service-instance-id": {
-		"name": "service-instance-id",
-		"property": {
-			"type": "string"
-		},
-		"sources": {
-			"default": {
-				"type": "source-input"
-			}
-		}
-	},
-	"oam-network-role": {
-		"name": "oam-network-role",
-		"property": {
-			"type": "string"
-		},
-		"sources": {
-			"default": {
-				"type": "source-input"
-			}
-		}
-	},
-	"oam-ipv4-ip-type": {
-		"name": "oam-ipv4-ip-type",
-		"property": {
-			"type": "string"
-		},
-		"sources": {
-			"default": {
-				"type": "source-input"
-			}
-		}
-	},
-	"oam-vm-type": {
-		"name": "oam-vm-type",
-		"property": {
-			"type": "string"
-		},
-		"sources": {
-			"default": {
-				"type": "source-input"
-			}
-		}
-	}
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/mdsal-array.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/mdsal-array.json
deleted file mode 100644
index 290a15752..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/mdsal-array.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"locations": {
-		"name": "locations",
-		"property": {
-			"type": "list",
-			"entry_schema": {
-				"type": "dt-location"
-			}
-		},
-		"sources": {
-			"mdsal": {
-				"type": "source-mdsal",
-				"properties": {
-					"url-path": "/restconf/config/L3VNF-API/services/service-list/$profile_name/12345",
-					"path": "/locations",
-					"input-key-mapping": {
-						"profile_name": "profile_name"
-					},
-					"output-key-mapping": {
-						"mdsal-country": "country",
-						"mdsal-state": "state"
-					},
-					"key-dependencies": [
-						"profile_name"
-					]
-				}
-			}
-		}
-	},
-	"profile_name": {
-		"name": "profile_name",
-		"property": {
-			"type": "string"
-		},
-		"sources": {
-			"default": {
-				"type": "source-input"
-			}
-		}
-	}
-}
-
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/mdsal-complex.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/mdsal-complex.json
deleted file mode 100644
index f5a7d7ef6..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/mdsal-complex.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	"location": {
-		"name": "location",
-		"property": {
-			"type": "dt-location"
-		},
-		"sources": {
-			"mdsal": {
-				"type": "source-mdsal",
-				"properties": {
-					"url-path": "/restconf/config/L3VNF-API/services/service-list/$profile_name/12345",
-					"path": "/locations",
-					"input-key-mapping": {
-						"profile_name": "profile_name"
-					},
-					"output-key-mapping": {
-						"mdsal-country": "country",
-						"mdsal-state": "state"
-					},
-					"key-dependencies": [
-						"profile_name"
-					]
-				}
-			}
-		}
-	},
-	"profile_name": {
-		"name": "profile_name",
-		"property": {
-			"type": "string"
-		},
-		"sources": {
-			"default": {
-				"type": "source-input"
-			}
-		}
-	}
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/mdsal-simple.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/mdsal-simple.json
deleted file mode 100644
index db7ee7eed..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/mdsal-simple.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-	"country": {
-		"name": "country",
-		"property": {
-			"type": "string"
-		},
-		"sources": {
-			"mdsal": {
-				"type": "source-mdsal",
-				"properties": {
-					"url-path": "/restconf/config/L3VNF-API/services/service-list/$profile_name/12345",
-					"path": "/locations",
-					"input-key-mapping": {
-						"profile_name": "profile_name"
-					},
-					"output-key-mapping": {
-						"country": "country"
-					},
-					"key-dependencies": [
-						"profile_name"
-					]
-				}
-			}
-		}
-	},
-	"profile_name": {
-		"name": "profile_name",
-		"property": {
-			"type": "string"
-		},
-		"sources": {
-			"input": {
-				"type": "source-input"
-			}
-		}
-	}
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/resource-assignments-array.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/resource-assignments-array.json
deleted file mode 100644
index 2b5865326..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/resource-assignments-array.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-	{
-		"name": "locations",
-		"input-param": true,
-		"property": {
-			"type": "list",
-			"entry_schema": {
-				"type": "dt-location"
-			}
-		},
-		"dictionary-name": "locations",
-		"dictionary-source": "mdsal",
-		"dependencies": []
-	}
-]
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/resource-assignments-complex-simple.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/resource-assignments-complex-simple.json
deleted file mode 100644
index 15881cfd0..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/resource-assignments-complex-simple.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-	{
-		"name": "v4-ip-prefix",
-		"input-param": true,
-		"property": {
-			"type": "string"
-		},
-		"dictionary-name": "v4-ip-prefix",
-		"dictionary-source": "mdsal",
-		"dependencies": []
-	}
-]
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/resource-assignments-complex.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/resource-assignments-complex.json
deleted file mode 100644
index e42bd9431..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/resource-assignments-complex.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-	{
-		"name": "location",
-		"input-param": true,
-		"property": {
-			"type": "dt-location"
-		},
-		"dictionary-name": "location",
-		"dictionary-source": "mdsal",
-		"dependencies": []
-	}
-]
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/resource-assignments-simple.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/resource-assignments-simple.json
deleted file mode 100644
index 6385e6a8b..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/resource-assignments-simple.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-	{
-		"name": "country",
-		"input-param": true,
-		"property": {
-			"type": "string"
-		},
-		"dictionary-name": "country",
-		"dictionary-source": "mdsal",
-		"dependencies": []
-	}
-]
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/simple-response.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/simple-response.json
deleted file mode 100644
index 8c2bb898f..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/Mdsal/simple-response.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	"locations": "US"
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/db/db-array.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/db/db-array.json
deleted file mode 100644
index bab783544..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/db/db-array.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"locations": {
-		"name": "locations",
-		"property": {
-			"type": "list",
-			"entry_schema": {
-				"type": "dt-location"
-			}
-		},
-		"sources": {
-			"db": {
-				"type": "source-sdnctl-db",
-				"properties": {
-					"query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
-					"input-key-mapping": {
-						"profile_name": "profile_name"
-					},
-					"output-key-mapping": {
-						"db-country": "country",
-						"db-state": "state"
-					},
-					"key-dependencies": [
-						"profile_name"
-					]
-				}
-			}
-		}
-	},
-	"profile_name": {
-		"name": "profile_name",
-		"property": {
-			"type": "string"
-		},
-		"sources": {
-			"input": {
-				"type": "source-input"
-			}
-		}
-	}
-}
-\ No newline at end of file
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/db/db-complex.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/db/db-complex.json
deleted file mode 100644
index 7310500e3..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/db/db-complex.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-	"location": {
-		"name": "location",
-		"property": {
-			"type": "dt-location"
-		},
-		"sources": {
-			"db": {
-				"type": "source-sdnctl-db",
-				"properties": {
-					"query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
-					"input-key-mapping": {
-						"profile_name": "profile_name"
-					},
-					"output-key-mapping": {
-						"db-country": "country",
-						"db-state": "state"
-					},
-					"key-dependencies": [
-						"profile_name"
-					]
-				}
-			}
-		}
-	},
-	"profile_name": {
-		"name": "profile_name",
-		"property": {
-			"type": "string"
-		},
-		"sources": {
-			"input": {
-				"type": "source-input"
-			}
-		}
-	}
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/db/db-simple.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/db/db-simple.json
deleted file mode 100644
index 86d29c751..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/db/db-simple.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"country": {
-		"name": "country",
-		"property": {
-			"type": "string"
-		},
-		"sources": {
-			"db": {
-				"type": "source-sdnctl-db",
-				"properties": {
-					"query": "SELECT country FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
-					"input-key-mapping": {
-						"profile_name": "profile_name"
-					},
-					"output-key-mapping": {
-						"country": "country"
-					},
-					"key-dependencies": [
-						"profile_name"
-					]
-				}
-			}
-		}
-	},
-	"profile_name": {
-		"name": "profile_name",
-		"property": {
-			"type": "string"
-		},
-		"sources": {
-			"input": {
-				"type": "source-input"
-			}
-		}
-	}
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/db/dt-location.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/db/dt-location.json
deleted file mode 100644
index 52e0a7967..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/db/dt-location.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"version": "1.0.0",
-	"description": "test Data Type",
-	"properties": {
-		"country": {
-			"required": true,
-			"type": "string"
-		},
-		"state": {
-			"required": false,
-			"type": "string"
-		}
-	},
-	"derived_from": "tosca.datatypes.Root"
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/db/resource-assignments-array.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/db/resource-assignments-array.json
deleted file mode 100644
index c82f9addc..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/db/resource-assignments-array.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-	{
-		"name": "locations",
-		"input-param": true,
-		"property": {
-			"type": "list",
-			"entry_schema": {
-				"type": "dt-location"
-			}
-		},
-		"dictionary-name": "locations",
-		"dictionary-source": "db",
-		"dependencies": []
-	}
-]
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/db/resource-assignments-complex.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/db/resource-assignments-complex.json
deleted file mode 100644
index 4cca99bde..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/db/resource-assignments-complex.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-	{
-		"name": "location",
-		"input-param": true,
-		"property": {
-			"type": "dt-location"
-		},
-		"dictionary-name": "location",
-		"dictionary-source": "db",
-		"dependencies": []
-	}
-]
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/db/resource-assignments-simple.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/db/resource-assignments-simple.json
deleted file mode 100644
index 02ce68be4..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/db/resource-assignments-simple.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-	{
-		"name": "country",
-		"input-param": true,
-		"property": {
-			"type": "string"
-		},
-		"dictionary-name": "country",
-		"dictionary-source": "db",
-		"dependencies": []
-	}
-]
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/default/default-simple.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/default/default-simple.json
deleted file mode 100644
index fca0dde83..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/default/default-simple.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"country": {
-		"name": "country",
-		"property": {
-			"type": "string"
-		},
-		"sources": {
-			"default": {
-				"type": "source-default"
-			}
-		}
-	},
-	"port": {
-		"name": "port",
-		"property": {
-			"type": "integer"
-		},
-		"sources": {
-			"default": {
-				"type": "source-default"
-			}
-		}
-	},
-	"voip-enabled": {
-		"name": "voip-enabled",
-		"property": {
-			"type": "boolean"
-		},
-		"sources": {
-			"default": {
-				"type": "source-default"
-			}
-		}
-	}
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/default/resource-assignments-simple.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/default/resource-assignments-simple.json
deleted file mode 100644
index fc92710a5..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/default/resource-assignments-simple.json
+++ /dev/null
@@ -1,35 +0,0 @@
-[
-	{
-		"name": "country",
-		"input-param": true,
-		"property": {
-			"type": "string",
-			"default": "US"
-		},
-		"dictionary-name": "country",
-		"dictionary-source": "default",
-		"dependencies": []
-	},
-	{
-		"name": "port",
-		"input-param": true,
-		"property": {
-			"type": "integer",
-			"default": 830
-		},
-		"dictionary-name": "port",
-		"dictionary-source": "default",
-		"dependencies": []
-	},
-	{
-		"name": "voip-enabled",
-		"input-param": true,
-		"property": {
-			"type": "boolean",
-			"default": true
-		},
-		"dictionary-name": "voip-enabled",
-		"dictionary-source": "default",
-		"dependencies": []
-	}
-]
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/dependency.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/dependency.json
deleted file mode 100644
index e08539c0d..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/dependency.json
+++ /dev/null
@@ -1,110 +0,0 @@
-[
-	{
-		"name": "vnf-id",
-		"input-param": true,
-		"property": {
-			"type": "string",
-			"required": true
-		},
-		"dictionary-name": "vnf-id",
-		"dictionary-source": "input",
-		"dependencies": []
-	},
-	{
-		"name": "service-instance-id",
-		"input-param": true,
-		"property": {
-			"type": "string",
-			"required": true
-		},
-		"dictionary-name": "service-instance-id",
-		"dictionary-source": "input",
-		"dependencies": []
-	},
-	{
-		"name": "bundle-id",
-		"input-param": true,
-		"property": {
-			"type": "string",
-			"required": true
-		},
-		"dictionary-name": "bundle-id",
-		"dictionary-source": "mdsal",
-		"dependencies": [
-			"vnf-id"
-		]
-	},
-	{
-		"name": "bundle-ip",
-		"input-param": true,
-		"property": {
-			"type": "string",
-			"required": true
-		},
-		"dictionary-name": "bundle-ip",
-		"dictionary-source": "mdsal",
-		"dependencies": [
-			"vnf-id"
-		]
-	},
-	{
-		"name": "bundle-mac",
-		"input-param": true,
-		"property": {
-			"type": "string"
-		},
-		"dictionary-name": "bundle-mac",
-		"dictionary-source": "mdsal",
-		"dependencies": [
-			"vnf-id",
-			"bundle-id"
-		]
-	},
-	{
-		"name": "managed-ip",
-		"input-param": true,
-		"property": {
-			"type": "string"
-		},
-		"dictionary-name": "managed-ip",
-		"dictionary-source": "mdsal",
-		"dependencies": [
-			"loopback-ip"
-		]
-	},
-	{
-		"name": "vnf-name",
-		"input-param": true,
-		"property": {
-			"type": "string",
-			"required": true
-		},
-		"dictionary-name": "vnf-name",
-		"dictionary-source": "input",
-		"dependencies": []
-	},
-	{
-		"name": "managed-ip1",
-		"input-param": true,
-		"property": {
-			"type": "string"
-		},
-		"dictionary-name": "managed-ip1",
-		"dictionary-source": "mdsal",
-		"dependencies": [
-			"loopback-ip"
-		]
-	},
-	{
-		"name": "loopback-ip",
-		"input-param": true,
-		"property": {
-			"type": "string"
-		},
-		"dictionary-name": "loopback-ip",
-		"dictionary-source": "db",
-		"dependencies": [
-			"bundle-mac"
-		]
-	}
-]
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/input/dt-location.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/input/dt-location.json
deleted file mode 100644
index 52e0a7967..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/input/dt-location.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"version": "1.0.0",
-	"description": "test Data Type",
-	"properties": {
-		"country": {
-			"required": true,
-			"type": "string"
-		},
-		"state": {
-			"required": false,
-			"type": "string"
-		}
-	},
-	"derived_from": "tosca.datatypes.Root"
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/input/input-complex.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/input/input-complex.json
deleted file mode 100644
index 7eabe440a..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/input/input-complex.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"location": {
-		"name": "location",
-		"property": {
-			"type": "dt-location"
-		},
-		"sources": {
-			"default": {
-				"type": "source-input"
-			}
-		}
-	},
-	"profile_name": {
-		"name": "profile_name",
-		"property": {
-			"type": "string"
-		},
-		"sources": {
-			"default": {
-				"type": "source-input"
-			}
-		}
-	}
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/input/input-simple.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/input/input-simple.json
deleted file mode 100644
index 7b663f36a..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/input/input-simple.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"country": {
-		"name": "country",
-		"property": {
-			"type": "string"
-		},
-		"sources": {
-			"default": {
-				"type": "source-input"
-			}
-		}
-	},
-	"port": {
-		"name": "port",
-		"property": {
-			"type": "integer"
-		},
-		"sources": {
-			"default": {
-				"type": "source-input"
-			}
-		}
-	},
-	"voip-enabled": {
-		"name": "voip-enabled",
-		"property": {
-			"type": "boolean"
-		},
-		"sources": {
-			"default": {
-				"type": "source-input"
-			}
-		}
-	}
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/input/resource-assignments-complex.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/input/resource-assignments-complex.json
deleted file mode 100644
index 9e17841b4..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/input/resource-assignments-complex.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-	{
-		"name": "location",
-		"input-param": true,
-		"property": {
-			"type": "dt-location",
-			"required": true
-		},
-		"dictionary-name": "location",
-		"dictionary-source": "input",
-		"dependencies": []
-	}
-]
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/input/resource-assignments-simple.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/input/resource-assignments-simple.json
deleted file mode 100644
index e3b2bcc06..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/input/resource-assignments-simple.json
+++ /dev/null
@@ -1,32 +0,0 @@
-[
-	{
-		"name": "country",
-		"input-param": true,
-		"property": {
-			"type": "string",
-			"default": "US"
-		},
-		"dictionary-source": "input",
-		"dependencies": []
-	},
-	{
-		"name": "port",
-		"input-param": true,
-		"property": {
-			"type": "integer",
-			"default": 830
-		},
-		"dictionary-source": "input",
-		"dependencies": []
-	},
-	{
-		"name": "voip-enabled",
-		"input-param": true,
-		"property": {
-			"type": "boolean",
-			"default": true
-		},
-		"dictionary-source": "input",
-		"dependencies": []
-	}
-]
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/input/sample-location.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/input/sample-location.json
deleted file mode 100644
index 2f3f1c102..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/mapping/input/sample-location.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"country": "US",
-	"state": "NJ"
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/input/input.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/input/input.json
deleted file mode 100644
index cd6fac128..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/input/input.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"api-ver": "2.00",
-	"originator-id": "MSO",
-	"request-id": "123456",
-	"service-instance-id": "ibcx0001vm001",
-	"service-type": "AVPN",
-	"vnf-type": "vUSP - vDBE-IPX HUB",
-	"vnf-id": 123456,
-	"service-template-name": "VRR-baseconfiguration",
-	"service-template-version": "1.0.0",
-	"action-name": "resource-assignment-action",
-	"group-name": "sample group name",
-	"bundle-id": "sample bundle id",
-	"bundle-mac": [
-		"Sample bundle mac",
-		"Sample bundle mac"
-	]
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/input/inputValidateTest.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/input/inputValidateTest.json
deleted file mode 100644
index 354ca577b..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/input/inputValidateTest.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"api-ver": "2.00",
-	"originator-id": "MSO",
-	"request-id": "123456",
-	"service-instance-id": "ibcx0001vm001",
-	"service-type": "AVPN",
-	"vnf-type": "vUSP - vDBE-IPX HUB",
-	"vnf-id": "",
-	"service-template-name": "VRR-baseconfiguration",
-	"service-template-version": "1.0.0",
-	"action-name": "resource-assignment-action",
-	"group-name": "sample group name",
-	"bundle-id": "sample bundle id",
-	"bundle-mac": [
-		"Sample bundle mac",
-		"Sample bundle mac"
-	]
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment.json
deleted file mode 100644
index cbea6a82c..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment.json
+++ /dev/null
@@ -1,407 +0,0 @@
-{
-	"metadata": {
-		"author": "ks220y@att.com",
-		"service-template-name": "VRR-baseconfiguration",
-		"service-template-version": "1.0.0",
-		"release": "1802",
-		"service-type": "AVPN",
-		"vnf-type": "VRR"
-	},
-	"topology_template": {
-		"inputs": {
-			"request-id": {
-				"required": true,
-				"type": "string"
-			},
-			"service-instance-id": {
-				"required": true,
-				"type": "string"
-			},
-			"action-name": {
-				"required": true,
-				"type": "string"
-			},
-			"scope-type": {
-				"required": true,
-				"type": "string"
-			},
-			"hostname": {
-				"required": true,
-				"type": "string"
-			}
-		},
-		"node_templates": {
-			"base-config-template": {
-				"type": "artifact-config-template",
-				"properties": {
-					"action-names": [
-						"resource-assignment-action"
-					]
-				},
-				"capabilities": {
-					"content": {
-						"properties": {
-							"content": "db://base-config-template"
-						}
-					},
-					"mapping": {
-						"properties": {
-							"mapping": [
-								{
-									"name": "vnf-id",
-									"input-param": true,
-									"property": {
-										"type": "string",
-										"required": true
-									},
-									"dictionary-name": "vnf-id",
-									"dictionary-source": "input"
-								},
-								{
-									"name": "group-name",
-									"input-param": true,
-									"property": {
-										"type": "string",
-										"required": true
-									},
-									"dictionary-name": "group-name",
-									"dictionary-source": "input"
-								}
-							]
-						}
-					}
-				}
-			},
-			"resource-assignment-action": {
-				"type": "dg-resource-assignment",
-				"interfaces": {
-					"CONFIG": {
-						"operations": {
-							"ResourceAssignment": {
-								
-							}
-						}
-					}
-				},
-				"capabilities": {
-					"dg-node": {
-						
-					}
-				},
-				"requirements": {
-					"component-dependency": {
-						"capability": "component-node",
-						"node": "resource-assignment",
-						"relationship": "tosca.relationships.DependsOn"
-					}
-				}
-			},
-			"licence-template": {
-				"type": "artifact-config-template",
-				"properties": {
-					"action-names": [
-						"resource-assignment-action"
-					]
-				},
-				"capabilities": {
-					"content": {
-						"properties": {
-							"content": "db://licence-template"
-						}
-					},
-					"mapping": {
-						"properties": {
-							"mapping": [
-								{
-									"name": "bundle-id",
-									"input-param": true,
-									"property": {
-										"type": "string"
-									},
-									"dictionary-name": "bundle-id",
-									"dictionary-source": "input"
-								},
-								{
-									"name": "bundle-mac",
-									"input-param": true,
-									"property": {
-										"type": "string",
-										"required": true
-									},
-									"dictionary-name": "bundle-mac",
-									"dictionary-source": "input"
-								}
-							]
-						}
-					}
-				}
-			},
-			"resource-assignment": {
-				"type": "component-resource-assignment",
-				"interfaces": {
-					"org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {
-						"operations": {
-							"process": {
-								"inputs": {
-									"action-name": "{ \"get_input\" : \"action-name\" }",
-									"resource-type": "vnf-type",
-									"template-names": [
-										"base-config-template",
-										"licence-template"
-									],
-									"request-id": "{ \"get_input\" : \"request-id\" }",
-									"resource-id": "{ \"get_input\" : \"vnf-id\" }"
-								},
-								"outputs": {
-									"resource-assignment-params": "",
-									"status": ""
-								}
-							}
-						}
-					}
-				},
-				"capabilities": {
-					"component-node": {
-						
-					}
-				}
-			}
-		}
-	},
-	"node_types": {
-		"dg-resource-assignment": {
-			"description": "This is Resource Assignment Directed Graph",
-			"version": "1.0.0",
-			"properties": {
-				"mode": {
-					"required": false,
-					"type": "string",
-					"default": "sync"
-				},
-				"version": {
-					"required": false,
-					"type": "string",
-					"default": "LATEST"
-				},
-				"is-start-flow": {
-					"required": false,
-					"type": "boolean",
-					"default": "false"
-				}
-			},
-			"capabilities": {
-				"dg-node": {
-					"type": "tosca.capabilities.Node"
-				},
-				"content": {
-					"type": "tosca.capabilities.Content",
-					"properties": {
-						"type": {
-							"required": false,
-							"type": "string",
-							"default": "json"
-						},
-						"content": {
-							"required": true,
-							"type": "string"
-						}
-					}
-				}
-			},
-			"requirements": {
-				"component-dependency": {
-					"capability": "component-node",
-					"node": "component-resource-assignment",
-					"relationship": "tosca.relationships.DependsOn"
-				}
-			},
-			"interfaces": {
-				"CONFIG": {
-					"operations": {
-						"ResourceAssignment": {
-							"inputs": {
-								"params": {
-									"required": false,
-									"type": "list",
-									"entry_schema": {
-										"type": "datatype-property"
-									}
-								}
-							}
-						}
-					}
-				}
-			},
-			"derived_from": "tosca.nodes.DG"
-		},
-		"component-resource-assignment": {
-			"description": "This is Resource Assignment Component API",
-			"version": "1.0.0",
-			"capabilities": {
-				"component-node": {
-					"type": "tosca.capabilities.Node"
-				}
-			},
-			"interfaces": {
-				"org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {
-					"operations": {
-						"process": {
-							"inputs": {
-								"action-name": {
-									"description": "Action Name to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",
-									"required": false,
-									"type": "string"
-								},
-								"handler-name": {
-									"description": "Name of the Artifact Node Template, to get the template Content. If template-content is present, then content wont be reterived from the Artifact Node Template.",
-									"required": true,
-									"type": "string"
-								},
-								"resource-type": {
-									"required": false,
-									"type": "string"
-								},
-								"template-names": {
-									"description": "Name of the Artifact Node Templates, to get the template Content.",
-									"required": true,
-									"type": "list",
-									"entry_schema": {
-										"type": "string"
-									}
-								},
-								"request-id": {
-									"description": "Request Id used to store the generated configuration, in the database along with the template-name",
-									"required": true,
-									"type": "string"
-								},
-								"resource-id": {
-									"description": "Id used to pull the data content from the data base. Either template-data or resource-id should be present",
-									"required": true,
-									"type": "string"
-								}
-							},
-							"outputs": {
-								"resource-assignment-params": {
-									"required": true,
-									"type": "string"
-								},
-								"status": {
-									"required": true,
-									"type": "string"
-								}
-							}
-						}
-					}
-				}
-			},
-			"derived_from": "tosca.nodes.Component"
-		},
-		"artifact-config-template": {
-			"description": "This is Configuration Velocity Template",
-			"version": "1.0.0",
-			"properties": {
-				"action-names": {
-					"required": true,
-					"type": "list",
-					"entry_schema": {
-						"type": "string"
-					}
-				},
-				"content": {
-					"required": false,
-					"type": "string"
-				},
-				"mapping": {
-					"required": false,
-					"type": "list",
-					"entry_schema": {
-						"type": "datatype-resource-assignment"
-					}
-				}
-			},
-			"capabilities": {
-				"content": {
-					"type": "tosca.capabilities.Content",
-					"properties": {
-						"content": {
-							"required": true,
-							"type": "string"
-						}
-					}
-				},
-				"mapping": {
-					"type": "tosca.capabilities.Mapping",
-					"properties": {
-						"mapping": {
-							"required": false,
-							"type": "list",
-							"entry_schema": {
-								"type": "datatype-resource-assignment"
-							}
-						}
-					}
-				}
-			},
-			"derived_from": "tosca.nodes.Artifact"
-		}
-	},
-	"data_types": {
-		"datatype-resource-assignment": {
-			"version": "1.0.0",
-			"description": "This is Resource Assignment Data Type",
-			"properties": {
-				"property": {
-					"required": true,
-					"type": "datatype-property"
-				},
-				"input-param": {
-					"required": true,
-					"type": "boolean"
-				},
-				"dictionary-name": {
-					"required": false,
-					"type": "string"
-				},
-				"dictionary-source": {
-					"required": false,
-					"type": "string"
-				},
-				"dependencies": {
-					"required": true,
-					"type": "list",
-					"entry_schema": {
-						"type": "string"
-					}
-				}
-			},
-			"derived_from": "tosca.datatypes.Root"
-		},
-		"datatype-property": {
-			"version": "1.0.0",
-			"description": "This is Entry point Input Data Type, which is dynamic datatype, The parameter names will be populated during the Design time for each inputs",
-			"properties": {
-				"type": {
-					"required": true,
-					"type": "string"
-				},
-				"description": {
-					"required": false,
-					"type": "string"
-				},
-				"required": {
-					"required": false,
-					"type": "boolean"
-				},
-				"default": {
-					"required": false,
-					"type": "string"
-				},
-				"entry_schema": {
-					"required": false,
-					"type": "string"
-				}
-			},
-			"derived_from": "tosca.datatypes.Root"
-		}
-	}
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json
deleted file mode 100644
index 4cbb8fa25..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json
+++ /dev/null
@@ -1,417 +0,0 @@
-{
-	"metadata": {
-		"author": "ks220y@att.com",
-		"service-template-name": "VRR-baseconfiguration",
-		"service-template-version": "1.0.0",
-		"release": "1802",
-		"service-type": "AVPN",
-		"vnf-type": "VRR"
-	},
-	"topology_template": {
-		"inputs": {
-			"request-id": {
-				"required": true,
-				"type": "string"
-			},
-			"service-instance-id": {
-				"required": true,
-				"type": "string"
-			},
-			"action-name": {
-				"required": true,
-				"type": "string"
-			},
-			"scope-type": {
-				"required": true,
-				"type": "string"
-			},
-			"hostname": {
-				"required": true,
-				"type": "string"
-			}
-		},
-		"node_templates": {
-			"base-config-template": {
-				"type": "artifact-config-template",
-				"properties": {
-					"action-names": [
-						"resource-assignment-action"
-					]
-				},
-				"capabilities": {
-					"content": {
-						"properties": {
-							"content": "db://base-config-template"
-						}
-					},
-					"mapping": {
-						"properties": {
-							"mapping": [
-								{
-									"name": "vnf-id",
-									"input-param": true,
-									"property": {
-										"type": "string",
-										"required": true
-									},
-									"dictionary-name": "vnf-id",
-									"dictionary-source": "input"
-								},
-								{
-									"name": "group-name",
-									"input-param": true,
-									"property": {
-										"type": "string",
-										"required": true
-									},
-									"dictionary-name": "group-name",
-									"dictionary-source": "input"
-								}
-							]
-						}
-					}
-				}
-			},
-			"resource-assignment-action": {
-				"type": "dg-resource-assignment",
-				"interfaces": {
-					"CONFIG": {
-						"operations": {
-							"ResourceAssignment": {
-								
-							}
-						}
-					}
-				},
-				"capabilities": {
-					"dg-node": {
-						
-					}
-				},
-				"requirements": {
-					"component-dependency": {
-						"capability": "component-node",
-						"node": "resource-assignment",
-						"relationship": "tosca.relationships.DependsOn"
-					}
-				}
-			},
-			"licence-template": {
-				"type": "artifact-config-template",
-				"properties": {
-					"action-names": [
-						"resource-assignment-action"
-					]
-				},
-				"capabilities": {
-					"content": {
-						"properties": {
-							"content": "db://licence-template"
-						}
-					},
-					"mapping": {
-						"properties": {
-							"mapping": [
-								{
-									"name": "bundle-id",
-									"input-param": true,
-									"property": {
-										"type": "string"
-									},
-									"dictionary-name": "bundle-id",
-									"dictionary-source": "input"
-								},
-								{
-									"name": "bundle-mac",
-									"input-param": true,
-									"property": {
-										"type": "string",
-										"required": true
-									},
-									"dictionary-name": "bundle-mac",
-									"dictionary-source": "input"
-								}
-							]
-						}
-					}
-				}
-			},
-			"resource-assignment": {
-				"type": "component-resource-assignment",
-				"interfaces": {
-					"org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {
-						"operations": {
-							"process": {
-								"inputs": {
-									"service-template-name": "VRR-baseconfiguration",
-									"service-template-version": "1.0.0",
-									"action-name": "{ \"get_input\" : \"action-name\" }",
-									"resource-type": "vnf-type",
-									"template-names": [
-										"base-config-template",
-										"licence-template"
-									],
-									"request-id": "{ \"get_input\" : \"request-id\" }",
-									"resource-id": "{ \"get_input\" : \"vnf-id\" }"
-								},
-								"outputs": {
-									"resource-assignment-params": "",
-									"status": ""
-								}
-							}
-						}
-					}
-				},
-				"capabilities": {
-					"component-node": {
-						
-					}
-				}
-			}
-		}
-	},
-	"node_types": {
-		"dg-resource-assignment": {
-			"description": "This is Resource Assignment Directed Graph",
-			"version": "1.0.0",
-			"properties": {
-				"mode": {
-					"required": false,
-					"type": "string",
-					"default": "sync"
-				},
-				"version": {
-					"required": false,
-					"type": "string",
-					"default": "LATEST"
-				},
-				"is-start-flow": {
-					"required": false,
-					"type": "boolean",
-					"default": "false"
-				}
-			},
-			"capabilities": {
-				"dg-node": {
-					"type": "tosca.capabilities.Node"
-				},
-				"content": {
-					"type": "tosca.capabilities.Content",
-					"properties": {
-						"type": {
-							"required": false,
-							"type": "string",
-							"default": "json"
-						},
-						"content": {
-							"required": true,
-							"type": "string"
-						}
-					}
-				}
-			},
-			"requirements": {
-				"component-dependency": {
-					"capability": "component-node",
-					"node": "component-resource-assignment",
-					"relationship": "tosca.relationships.DependsOn"
-				}
-			},
-			"interfaces": {
-				"CONFIG": {
-					"operations": {
-						"ResourceAssignment": {
-							"inputs": {
-								"params": {
-									"required": false,
-									"type": "list",
-									"entry_schema": {
-										"type": "datatype-property"
-									}
-								}
-							}
-						}
-					}
-				}
-			},
-			"derived_from": "tosca.nodes.DG"
-		},
-		"component-resource-assignment": {
-			"description": "This is Resource Assignment Component API",
-			"version": "1.0.0",
-			"capabilities": {
-				"component-node": {
-					"type": "tosca.capabilities.Node"
-				}
-			},
-			"interfaces": {
-				"org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {
-					"operations": {
-						"process": {
-							"inputs": {
-								"action-name": {
-									"description": "Action Name to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",
-									"required": false,
-									"type": "string"
-								},
-								"handler-name": {
-									"description": "Name of the Artifact Node Template, to get the template Content. If template-content is present, then content wont be reterived from the Artifact Node Template.",
-									"required": true,
-									"type": "string"
-								},
-								"resource-type": {
-									"required": false,
-									"type": "string"
-								},
-								"service-template-name": {
-									"required": true,
-									"type": "string"
-								},
-								"service-template-version": {
-									"required": true,
-									"type": "string"
-								},
-								"template-names": {
-									"description": "Name of the Artifact Node Templates, to get the template Content.",
-									"required": true,
-									"type": "list",
-									"entry_schema": {
-										"type": "string"
-									}
-								},
-								"request-id": {
-									"description": "Request Id used to store the generated configuration, in the database along with the template-name",
-									"required": true,
-									"type": "string"
-								},
-								"resource-id": {
-									"description": "Id used to pull the data content from the data base. Either template-data or resource-id should be present",
-									"required": true,
-									"type": "string"
-								}
-							},
-							"outputs": {
-								"resource-assignment-params": {
-									"required": true,
-									"type": "string"
-								},
-								"status": {
-									"required": true,
-									"type": "string"
-								}
-							}
-						}
-					}
-				}
-			},
-			"derived_from": "tosca.nodes.Component"
-		},
-		"artifact-config-template": {
-			"description": "This is Configuration Velocity Template",
-			"version": "1.0.0",
-			"properties": {
-				"action-names": {
-					"required": true,
-					"type": "list",
-					"entry_schema": {
-						"type": "string"
-					}
-				},
-				"content": {
-					"required": false,
-					"type": "string"
-				},
-				"mapping": {
-					"required": false,
-					"type": "list",
-					"entry_schema": {
-						"type": "datatype-resource-assignment"
-					}
-				}
-			},
-			"capabilities": {
-				"content": {
-					"type": "tosca.capabilities.Content",
-					"properties": {
-						"content": {
-							"required": true,
-							"type": "string"
-						}
-					}
-				},
-				"mapping": {
-					"type": "tosca.capabilities.Mapping",
-					"properties": {
-						"mapping": {
-							"required": false,
-							"type": "list",
-							"entry_schema": {
-								"type": "datatype-resource-assignment"
-							}
-						}
-					}
-				}
-			},
-			"derived_from": "tosca.nodes.Artifact"
-		}
-	},
-	"data_types": {
-		"datatype-resource-assignment": {
-			"version": "1.0.0",
-			"description": "This is Resource Assignment Data Type",
-			"properties": {
-				"property": {
-					"required": true,
-					"type": "datatype-property"
-				},
-				"input-param": {
-					"required": true,
-					"type": "boolean"
-				},
-				"dictionary-name": {
-					"required": false,
-					"type": "string"
-				},
-				"dictionary-source": {
-					"required": false,
-					"type": "string"
-				},
-				"dependencies": {
-					"required": true,
-					"type": "list",
-					"entry_schema": {
-						"type": "string"
-					}
-				}
-			},
-			"derived_from": "tosca.datatypes.Root"
-		},
-		"datatype-property": {
-			"version": "1.0.0",
-			"description": "This is Entry point Input Data Type, which is dynamic datatype, The parameter names will be populated during the Design time for each inputs",
-			"properties": {
-				"type": {
-					"required": true,
-					"type": "string"
-				},
-				"description": {
-					"required": false,
-					"type": "string"
-				},
-				"required": {
-					"required": false,
-					"type": "boolean"
-				},
-				"default": {
-					"required": false,
-					"type": "string"
-				},
-				"entry_schema": {
-					"required": false,
-					"type": "string"
-				}
-			},
-			"derived_from": "tosca.datatypes.Root"
-		}
-	}
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/velocity/base-config-template.vtl b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/velocity/base-config-template.vtl
deleted file mode 100644
index 92dba1024..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/velocity/base-config-template.vtl
+++ /dev/null
@@ -1,40 +0,0 @@
- <config>
-	        <configuration>
-	        	<groups>
-				<name>${group-name}</name>
-				<routing-instances>
-					<instance>
-						<name>&lt;*&gt;</name>
-						<protocols>
-							<pim>
-								<dense-groups>
-									<dynamic-reject />
-									<pim-dense-group-type>
-										<name>224.0.1.40/32</name>
-									</pim-dense-group-type>
-									<pim-dense-group-type>
-										<name>224.0.1.39/32</name>
-									</pim-dense-group-type>
-									<pim-dense-group-type>
-										<name>224.0.0.0/4</name>
-										<reject />
-									</pim-dense-group-type>
-								</dense-groups>
-								<rp>
-									<auto-rp>
-										<discovery />
-									</auto-rp>
-								</rp>
-								<interface>
-									<name>&lt;*&gt;</name>
-									<disable />
-									<priority>1000</priority>
-								</interface>
-								<reset-tracking-bit />
-							</pim>
-						</protocols>
-					</instance>
-				</routing-instances>
-			</groups>
-		</configuration>
-	</config>
-\ No newline at end of file
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/dict.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/dict.json
deleted file mode 100644
index f7b09d5af..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/dict.json
+++ /dev/null
@@ -1,172 +0,0 @@
-[
-	{
-		"name": "adiod-unicast-route-reflectors",
-		"resourcePath": "vnf/protocol/adiod-unicast-route-reflectors",
-		"resourceType": "ATT",
-		"dataType": "list",
-		"entrySchema": "dt-adiod-unicast-route-reflectors",
-		"definition": "{\r\n  \"tags\" : \"ADIOD3\",\r\n  \"name\" : \"adiod-unicast-route-reflectors\",\r\n  \"description\" : \"dd\",\r\n  \"updated-by\" : \"ks220y@att.com\",\r\n  \"resource-type\" : \"ATT\",\r\n  \"resource-path\" : \"vnf/protocol/adiod-unicast-route-reflectors\",\r\n  \"data-type\" : \"list\",\r\n  \"entry-schema\" : \"dt-adiod-unicast-route-reflectors\",\r\n  \"source\" : {\r\n    \"input\" : { },\r\n    \"network-resource-discovery\" : {\r\n      \"input-key-mapping\" : {\r\n        \"complex-code-char8\" : \"complex-code-char8\"\r\n      },\r\n      \"output-key-mapping\" : {\r\n        \"adiod-unicast-route-reflectors\" : \"adiod-unicast-route-reflectors\"\r\n      }\r\n    }\r\n  },\r\n  \"candidate-dependency\" : {\r\n    \"network-resource-discovery\" : {\r\n      \"names\" : [ \"complex-code-char8\" ]\r\n    }\r\n  }\r\n}",
-		"description": "dd",
-		"tags": "ADIOD3",
-		"creationDate": "2017-11-16T17:31:38.000+0000",
-		"updatedBy": "ks220y@att.com"
-	},
-	{
-		"name": "adiod-vpnv4-route-reflectors",
-		"resourcePath": "vnf/servers/adiod-vpnv4-route-reflectors",
-		"resourceType": "ATT",
-		"dataType": "list",
-		"entrySchema": "dt-adiod-vpnv4-route-reflectors",
-		"definition": "{\r\n  \"tags\" : \"ADIOD3\",\r\n  \"name\" : \"adiod-vpnv4-route-reflectors\",\r\n  \"description\" : \"To be provided\",\r\n  \"updated-by\" : \"ks220y@att.com\",\r\n  \"resource-type\" : \"ATT\",\r\n  \"resource-path\" : \"vnf/servers/adiod-vpnv4-route-reflectors\",\r\n  \"data-type\" : \"list\",\r\n  \"entry-schema\" : \"dt-adiod-vpnv4-route-reflectors\",\r\n  \"source\" : {\r\n    \"input\" : { }\r\n  }\r\n}",
-		"description": "To be provided",
-		"tags": "ADIOD3",
-		"creationDate": "2017-11-16T17:31:38.000+0000",
-		"updatedBy": "ks220y@att.com"
-	},
-	{
-		"name": "asn-region",
-		"resourcePath": "vnf/protocols/asn-region",
-		"resourceType": "ATT",
-		"dataType": "string",
-		"definition": "{\r\n  \"tags\" : \"ADIOD3\",\r\n  \"name\" : \"asn-region\",\r\n  \"description\" : \"To be provided\",\r\n  \"updated-by\" : \"ks220y@att.com\",\r\n  \"resource-type\" : \"ATT\",\r\n  \"resource-path\" : \"vnf/protocols/asn-region\",\r\n  \"data-type\" : \"string\",\r\n  \"source\" : {\r\n    \"input\" : { },\r\n    \"network-resource-discovery\" : {\r\n      \"input-key-mapping\" : {\r\n        \"hostname\" : \"hostname\"\r\n      },\r\n      \"output-key-mapping\" : {\r\n        \"asn-region\" : \"asn-region\"\r\n      }\r\n    }\r\n  },\r\n  \"candidate-dependency\" : {\r\n    \"network-resource-discovery\" : {\r\n      \"names\" : [ \"hostname\" ]\r\n    }\r\n  }\r\n}",
-		"description": "To be provided",
-		"tags": "ADIOD3",
-		"creationDate": "2017-11-17T11:31:29.000+0000",
-		"updatedBy": "ks220y@att.com"
-	},
-	{
-		"name": "bundle-id",
-		"resourcePath": "vnf/interface/bundle-id",
-		"resourceType": "ATT",
-		"dataType": "string",
-		"definition": "{\r\n  \"tags\" : \"ADIOD3\",\r\n  \"name\" : \"bundle-id\",\r\n  \"description\" : \"To be provided\",\r\n  \"updated-by\" : \"ks220y@att.com\",\r\n  \"resource-type\" : \"ATT\",\r\n  \"resource-path\" : \"vnf/interface/bundle-id\",\r\n  \"data-type\" : \"string\",\r\n  \"source\" : {\r\n    \"input\" : { },\r\n    \"network-resource-discovery\" : {\r\n      \"input-key-mapping\" : {\r\n        \"hostname\" : \"hostname\"\r\n      },\r\n      \"output-key-mapping\" : {\r\n        \"bundle-id\" : \"bundle-id\"\r\n      }\r\n    }\r\n  },\r\n  \"candidate-dependency\" : {\r\n    \"network-resource-discovery\" : {\r\n      \"names\" : [ \"hostname\" ]\r\n    }\r\n  }\r\n}",
-		"description": "To be provided",
-		"tags": "ADIOD3",
-		"creationDate": "2017-11-16T17:31:39.000+0000",
-		"updatedBy": "ks220y@att.com"
-	},
-	{
-		"name": "lo0-local-ipv4-address",
-		"resourcePath": "vnf/interface/lo0-local-ipv4",
-		"resourceType": "ATT",
-		"dataType": "ipv4-address",
-		"definition": "{\r\n  \"tags\" : \"ADIOD3\",\r\n  \"name\" : \"lo0-local-ipv4-address\",\r\n  \"description\" : \"To be provided\",\r\n  \"updated-by\" : \"ks220y@att.com\",\r\n  \"resource-type\" : \"ATT\",\r\n  \"resource-path\" : \"vnf/interface/lo0-local-ipv4\",\r\n  \"data-type\" : \"string\",\r\n  \"source\" : {\r\n    \"input\" : { },\r\n    \"network-resource-discovery\" : {\r\n      \"input-key-mapping\" : {\r\n        \"hostname\" : \"hostname\"\r\n      },\r\n      \"output-key-mapping\" : {\r\n        \"lo0-local-ipv4\" : \"lo0-local-ipv4\"\r\n      }\r\n    }\r\n  },\r\n  \"candidate-dependency\" : {\r\n    \"network-resource-discovery\" : {\r\n      \"names\" : [ \"hostname\" ]\r\n    }\r\n  }\r\n}",
-		"description": "To be provided",
-		"tags": "ADIOD3",
-		"creationDate": "2017-11-16T17:31:40.000+0000",
-		"updatedBy": "ks220y@att.com"
-	},
-	{
-		"name": "lo10-local-ipv4-address",
-		"resourcePath": "vnf/interface/lo10-local-ipv4",
-		"resourceType": "ATT",
-		"dataType": "ipv4-address",
-		"definition": "{\r\n  \"tags\" : \"ADIOD3\",\r\n  \"name\" : \"lo10-local-ipv4-address\",\r\n  \"description\" : \"To be provided\",\r\n  \"updated-by\" : \"ks220y@att.com\",\r\n  \"resource-type\" : \"ATT\",\r\n  \"resource-path\" : \"vnf/interface/lo10-local-ipv4\",\r\n  \"data-type\" : \"string\",\r\n  \"source\" : {\r\n    \"input\" : { },\r\n    \"network-resource-discovery\" : {\r\n      \"input-key-mapping\" : {\r\n        \"hostname\" : \"hostname\"\r\n      },\r\n      \"output-key-mapping\" : {\r\n        \"lo10-local-ipv4\" : \"lo10-local-ipv4\"\r\n      }\r\n    }\r\n  },\r\n  \"candidate-dependency\" : {\r\n    \"network-resource-discovery\" : {\r\n      \"names\" : [ \"hostname\" ]\r\n    }\r\n  }\r\n}",
-		"description": "To be provided",
-		"tags": "ADIOD3",
-		"creationDate": "2017-11-16T17:31:41.000+0000",
-		"updatedBy": "ks220y@att.com"
-	},
-	{
-		"name": "oam-remote-ipv4-address",
-		"resourcePath": "vnf/oam-remote-ipv4-address",
-		"resourceType": "ATT",
-		"dataType": "string",
-		"definition": "{\r\n  \"tags\" : \"ADIOD3\",\r\n  \"name\" : \"oam-remote-ipv4-address\",\r\n  \"description\" : \"To be provided\",\r\n  \"updated-by\" : \"ks220y@att.com\",\r\n  \"resource-type\" : \"ATT\",\r\n  \"resource-path\" : \"vnf/oam-remote-ipv4-address\",\r\n  \"data-type\" : \"string\",\r\n  \"source\" : {\r\n    \"input\" : {\r\n      \"key\" : \"oam-remote-ipv4-address\"\r\n    },\r\n    \"mdsal\" : {\r\n      \"base\" : \"sdnc-gc\",\r\n      \"type\" : \"JSON\",\r\n      \"url-path\" : \"/restconf/config/L3VNF-API\",\r\n      \"path\" : \"/${services/service-list/$service-instance-id/service-data/vnf-topology-information/vnf-assignments/vnf-vms/$oam-ipv4-ip-type/vm-networks/$oam-network-role/v4-assigned-ip-list/$oam-vm-type\",\r\n      \"input-key-mapping\" : {\r\n        \"service-instance-id\" : \"service-instance-id\",\r\n        \"oam-network-role\" : \"oam-network-role\",\r\n        \"oam-ipv4-ip-type\" : \"oam-ipv4-ip-type\",\r\n        \"oam-vm-type\" : \"oam-vm-type\"\r\n      },\r\n      \"output-key-mapping\" : {\r\n        \"oam-remote-ipv4-address\" : \"ipv4-gateway-prefix\"\r\n      }\r\n    }\r\n  },\r\n  \"candidate-dependency\" : {\r\n    \"mdsal\" : {\r\n      \"names\" : [ \"service-instance-id\", \"oam-network-role\", \"oam-v4-ip-type \", \"oam-vm-type\" ]\r\n    }\r\n  }\r\n}",
-		"description": "To be provided",
-		"tags": "ADIOD3",
-		"creationDate": "2017-11-16T10:52:24.000+0000",
-		"updatedBy": "ks220y@att.com"
-	},
-	{
-		"name": "ospf-area",
-		"resourcePath": "/ospf-area",
-		"resourceType": "ATT",
-		"dataType": "string",
-		"definition": "{\r\n  \"tags\" : \"ADIOD3\",\r\n  \"name\" : \"ospf-area\",\r\n  \"description\" : \"ospf-area\",\r\n  \"updated-by\" : \"ks220y@att.com\",\r\n  \"resource-type\" : \"ATT\",\r\n  \"resource-path\" : \"/ospf-area\",\r\n  \"data-type\" : \"string\",\r\n  \"source\" : {\r\n    \"input\" : {\r\n      \"key\" : \"ospf-area\"\r\n    },\r\n    \"network-resource-discovery\" : {\r\n      \"input-key-mapping\" : {\r\n        \"hostname\" : \"mainResource\"\r\n      },\r\n      \"output-key-mapping\" : {\r\n        \"ospf-area\" : \"ospf-area\"\r\n      }\r\n    }\r\n  }\r\n}",
-		"description": "ospf-area",
-		"tags": "ADIOD3",
-		"creationDate": "2017-11-16T10:52:24.000+0000",
-		"updatedBy": "ks220y@att.com"
-	},
-	{
-		"name": "ospf-cost",
-		"resourcePath": "/ospf-cost",
-		"resourceType": "ATT",
-		"dataType": "string",
-		"definition": "{\r\n  \"tags\" : \"ADIOD3\",\r\n  \"name\" : \"ospf-cost\",\r\n  \"description\" : \"ospf-cost\",\r\n  \"updated-by\" : \"ks220y@att.com\",\r\n  \"resource-type\" : \"ATT\",\r\n  \"resource-path\" : \"/ospf-cost\",\r\n  \"data-type\" : \"string\",\r\n  \"source\" : {\r\n    \"input\" : {\r\n      \"key\" : \"ospf-cost\"\r\n    },\r\n    \"network-resource-discovery\" : {\r\n      \"input-key-mapping\" : {\r\n        \"hostname\" : \"mainResource\"\r\n      },\r\n      \"output-key-mapping\" : {\r\n        \"ospf-cost\" : \"ospf-cost\"\r\n      }\r\n    }\r\n  }\r\n}",
-		"description": "ospf-cost",
-		"tags": "ADIOD3",
-		"creationDate": "2017-11-16T10:52:25.000+0000",
-		"updatedBy": "ks220y@att.com"
-	},
-	{
-		"name": "si-local-ipv4-address",
-		"resourcePath": "vnf/interface/si-local-ipv4",
-		"resourceType": "ATT",
-		"dataType": "string",
-		"definition": "{\r\n  \"tags\" : \"ADIOD3\",\r\n  \"name\" : \"si-local-ipv4-address\",\r\n  \"description\" : \"To be provided\",\r\n  \"updated-by\" : \"ks220y@att.com\",\r\n  \"resource-type\" : \"ATT\",\r\n  \"resource-path\" : \"vnf/interface/si-local-ipv4\",\r\n  \"data-type\" : \"string\",\r\n  \"source\" : {\r\n    \"input\" : { },\r\n    \"network-resource-discovery\" : {\r\n      \"input-key-mapping\" : {\r\n        \"hostname\" : \"hostname\"\r\n      },\r\n      \"output-key-mapping\" : {\r\n        \"si-local-ipv4\" : \"si-local-ipv4\"\r\n      }\r\n    }\r\n  },\r\n  \"candidate-dependency\" : {\r\n    \"network-resource-discovery\" : {\r\n      \"names\" : [ \"hostname\" ]\r\n    }\r\n  }\r\n}",
-		"description": "To be provided",
-		"tags": "ADIOD3",
-		"creationDate": "2017-11-16T10:52:25.000+0000",
-		"updatedBy": "ks220y@att.com"
-	},
-	{
-		"name": "tacacs-server-ipv4-addresses",
-		"resourcePath": "vnf/servers/tacacs-server-ipv4-addresses",
-		"resourceType": "ATT",
-		"dataType": "list",
-		"entrySchema": "dt-tacacs-server-ipv4-addresses",
-		"definition": "{\r\n  \"tags\" : \"ADIOD3\",\r\n  \"name\" : \"tacacs-server-ipv4-addresses\",\r\n  \"description\" : \"to be provided\",\r\n  \"updated-by\" : \"ks220y@att.com\",\r\n  \"resource-type\" : \"ATT\",\r\n  \"resource-path\" : \"vnf/servers/tacacs-server-ipv4-addresses\",\r\n  \"data-type\" : \"list\",\r\n  \"entry-schema\" : \"dt-tacacs-server-ipv4-addresses\",\r\n  \"source\" : {\r\n    \"input\" : { },\r\n    \"network-resource-discovery\" : {\r\n      \"input-key-mapping\" : {\r\n        \"region\" : \"region\",\r\n        \"complex-code-char8\" : \"complex-code-char8\",\r\n        \"tacacs-domain-name\" : \"tacacs-domain-name\"\r\n      },\r\n      \"output-key-mapping\" : {\r\n        \"tacacs-server-ipv4-addresses\" : \"tacacs-server-ipv4-addresses\"\r\n      }\r\n    }\r\n  },\r\n  \"candidate-dependency\" : {\r\n    \"network-resource-discovery\" : {\r\n      \"names\" : [ \"region\", \"complex-code-char8\", \"tacacs-domain-name\" ]\r\n    }\r\n  }\r\n}",
-		"description": "to be provided",
-		"tags": "ADIOD3",
-		"creationDate": "2017-11-16T17:31:43.000+0000",
-		"updatedBy": "ks220y@att.com"
-	},
-	{
-		"name": "uplink-1-unit",
-		"resourcePath": "vnf/interface/uplink-1-unit",
-		"resourceType": "ATT",
-		"dataType": "string",
-		"definition": "{\r\n  \"tags\" : \"ADIOD3\",\r\n  \"name\" : \"uplink-1-unit\",\r\n  \"description\" : \"To be provided\",\r\n  \"updated-by\" : \"ks220y@att.com\",\r\n  \"resource-type\" : \"ATT\",\r\n  \"resource-path\" : \"vnf/interface/uplink-1-unit\",\r\n  \"data-type\" : \"string\",\r\n  \"source\" : {\r\n    \"input\" : { },\r\n    \"network-resource-discovery\" : {\r\n      \"input-key-mapping\" : {\r\n        \"hostname\" : \"hostname\"\r\n      },\r\n      \"output-key-mapping\" : {\r\n        \"uplink-1-unit\" : \"uplink-1-unit\"\r\n      }\r\n    }\r\n  },\r\n  \"candidate-dependency\" : {\r\n    \"network-resource-discovery\" : {\r\n      \"names\" : [ \"hostname\" ]\r\n    }\r\n  }\r\n}",
-		"description": "To be provided",
-		"tags": "ADIOD3",
-		"creationDate": "2017-11-16T17:31:44.000+0000",
-		"updatedBy": "ks220y@att.com"
-	},
-	{
-		"name": "uplink-2-unit",
-		"resourcePath": "vnf/interface/uplink-2-unit",
-		"resourceType": "ATT",
-		"dataType": "string",
-		"definition": "{\r\n  \"tags\" : \"ADIOD3\",\r\n  \"name\" : \"uplink-2-unit\",\r\n  \"description\" : \"To be provided\",\r\n  \"updated-by\" : \"ks220y@att.com\",\r\n  \"resource-type\" : \"ATT\",\r\n  \"resource-path\" : \"vnf/interface/uplink-2-unit\",\r\n  \"data-type\" : \"string\",\r\n  \"source\" : {\r\n    \"input\" : { },\r\n    \"network-resource-discovery\" : {\r\n      \"input-key-mapping\" : {\r\n        \"hostname\" : \"hostname\"\r\n      },\r\n      \"output-key-mapping\" : {\r\n        \"uplink-2-unit\" : \"uplink-2-unit\"\r\n      }\r\n    }\r\n  },\r\n  \"candidate-dependency\" : {\r\n    \"network-resource-discovery\" : {\r\n      \"names\" : [ \"hostname\" ]\r\n    }\r\n  }\r\n}",
-		"description": "To be provided",
-		"tags": "ADIOD3",
-		"creationDate": "2017-11-16T17:31:45.000+0000",
-		"updatedBy": "ks220y@att.com"
-	},
-	{
-		"name": "wan-aggregate-ipv4-addresses",
-		"resourcePath": "vnf/wan-aggregate-ipv4-addresses",
-		"resourceType": "ATT",
-		"dataType": "list",
-		"entrySchema": "dt-v4-aggregate",
-		"definition": "{\r\n  \"tags\" : \"wan-aggregate-ipv4-addresses, tosca.datatypes.Root, data_type, ks220y@att.com\",\r\n  \"name\" : \"wan-aggregate-ipv4-addresses\",\r\n  \"description\" : \"To be provided\",\r\n  \"updated-by\" : \"ks220y@att.com\",\r\n  \"resource-type\" : \"ATT\",\r\n  \"resource-path\" : \"vnf/wan-aggregate-ipv4-addresses\",\r\n  \"data-type\" : \"list\",\r\n  \"entry-schema\" : \"dt-v4-aggregate\",\r\n  \"source\" : {\r\n    \"input\" : { },\r\n    \"mdsal\" : {\r\n      \"base\" : \"sdnc-gc\",\r\n      \"type\" : \"JSON\",\r\n      \"url-path\" : \"/restconf/config/L3VNF-API\",\r\n      \"path\" : \"/${services/service-list/$service-instance-id/service-data/vnf-topology-information/vnf-assignments/vnf-vms/$oam-ipv4-ip-type/vm-networks/$oam-network-role/v4-assigned-ip-list/$oam-vm-type\",\r\n      \"input-key-mapping\" : {\r\n        \"service-instance-id\" : \"service-instance-id\",\r\n        \"oam-network-role\" : \"oam-network-role\",\r\n        \"oam-ipv4-ip-type\" : \"oam-ipv4-ip-type\",\r\n        \"oam-vm-type\" : \"oam-vm-type\"\r\n      },\r\n      \"output-key-mapping\" : {\r\n        \"wan-aggregate-ipv4-addresses\" : \"v4-ip-prefix-length\"\r\n      }\r\n    }\r\n  },\r\n  \"candidate-dependency\" : {\r\n    \"mdsal\" : {\r\n      \"names\" : [ \"service-instance-id\", \"oam-network-role\", \"oam-v4-ip-type \", \"oam-vm-type\" ]\r\n    }\r\n  }\r\n}",
-		"description": "To be provided",
-		"tags": "wan-aggregate-ipv4-addresses, tosca.datatypes.Root, data_type, ks220y@att.com",
-		"creationDate": "2017-11-16T17:31:45.000+0000",
-		"updatedBy": "ks220y@att.com"
-	},
-	{
-		"name": "wan-aggregate-ipv6-addresses",
-		"resourcePath": "vnf/wan-aggregate-ipv6-addresses",
-		"resourceType": "ATT",
-		"dataType": "list",
-		"entrySchema": "dt-v6-aggregate",
-		"definition": "{\r\n  \"tags\" : \"ADIOD3\",\r\n  \"name\" : \"wan-aggregate-ipv6-addresses\",\r\n  \"description\" : \"To be provided\",\r\n  \"updated-by\" : \"ks220y@att.com\",\r\n  \"resource-type\" : \"ATT\",\r\n  \"resource-path\" : \"vnf/wan-aggregate-ipv6-addresses\",\r\n  \"data-type\" : \"list\",\r\n  \"entry-schema\" : \"dt-v6-aggregate\",\r\n  \"source\" : {\r\n    \"input\" : { },\r\n    \"mdsal\" : {\r\n      \"base\" : \"sdnc-gc\",\r\n      \"type\" : \"JSON\",\r\n      \"url-path\" : \"/restconf/config/L3VNF-API\",\r\n      \"path\" : \"/${services/service-list/$service-instance-id/service-data/vnf-topology-information/vnf-assignments/vnf-vms/VCO\",\r\n      \"input-key-mapping\" : {\r\n        \"service-instance-id\" : \"service-instance-id\",\r\n        \"oam-network-role\" : \"oam-network-role\",\r\n        \"oam-ipv4-ip-type\" : \"oam-ipv4-ip-type\",\r\n        \"oam-vm-type\" : \"oam-vm-type\"\r\n      },\r\n      \"output-key-mapping\" : {\r\n        \"wan-aggregate-ipv6.addresses\" : \"v4-ip-prefix-length\"\r\n      }\r\n    }\r\n  },\r\n  \"candidate-dependency\" : {\r\n    \"mdsal\" : {\r\n      \"names\" : [ \"service-instance-id\", \"oam-network-role\", \"oam-v4-ip-type \", \"oam-vm-type\" ]\r\n    }\r\n  }\r\n}",
-		"description": "To be provided",
-		"tags": "ADIOD3",
-		"creationDate": "2017-11-16T17:31:46.000+0000",
-		"updatedBy": "ks220y@att.com"
-	}
-]
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/input-complex.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/input-complex.json
deleted file mode 100644
index 70865015c..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/input-complex.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-	"request-id": "1234",
-	"service-instance-id": "adsfdsf",
-	"action-name": "resource-assignment-action",
-	"scope-type": "vnf-type",
-	"hostname": "sample-host",
-	"resource-assignment-request": {
-		"uplink-2-unit": "sample-uplink-2-unit",
-		"bundle-mac": "sample-bundle-mac",
-		"wan-aggregate-ipv6-addresses": [
-			{
-				"v6-address": "sample-v6-address",
-				"v6-plen": "sample-v6-plen"
-			}
-		],
-		"ospf-area": "sample-ospf-area",
-		"ospf-cost": 10.0,
-		"bundle-id": "bundle-id",
-		"adiod-unicast-route-reflectors": [
-			{
-				"v4-address": "sample-v4-address",
-				"name": "sample-name"
-			}
-		],
-		"oam-remote-ipv4-address": "",
-		"adiod-vpnv4-route-reflectors": [
-			{
-				"v4-address": "sample-v4-address",
-				"name": "sample-name"
-			}
-		],
-		"lo10-local-ipv4-address": "sample-lo10-local-ipv4-address",
-		"wan-aggregate-ipv4-addresses": [
-			{
-				"v4-address": "sample-v4-address",
-				"v4-plen": 0
-			}
-		],
-		"lo0-local-ipv4-address": "sample-lo0-local-ipv4-address",
-		"uplink-1-unit": "sample-uplink-1-unit",
-		"tacacs-server-ipv4-addresses": [
-			{
-				"tacacs-server-ipv4-address": "sample-tacacs-server-ipv4-address"
-			}
-		],
-		"asn-region": "sample-asn-region",
-		"si-local-ipv4-address": "sample-si-local-ipv4-address"
-	}
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/velocity/base-config-template.vtl b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/velocity/base-config-template.vtl
deleted file mode 100644
index 92dba1024..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/velocity/base-config-template.vtl
+++ /dev/null
@@ -1,40 +0,0 @@
- <config>
-	        <configuration>
-	        	<groups>
-				<name>${group-name}</name>
-				<routing-instances>
-					<instance>
-						<name>&lt;*&gt;</name>
-						<protocols>
-							<pim>
-								<dense-groups>
-									<dynamic-reject />
-									<pim-dense-group-type>
-										<name>224.0.1.40/32</name>
-									</pim-dense-group-type>
-									<pim-dense-group-type>
-										<name>224.0.1.39/32</name>
-									</pim-dense-group-type>
-									<pim-dense-group-type>
-										<name>224.0.0.0/4</name>
-										<reject />
-									</pim-dense-group-type>
-								</dense-groups>
-								<rp>
-									<auto-rp>
-										<discovery />
-									</auto-rp>
-								</rp>
-								<interface>
-									<name>&lt;*&gt;</name>
-									<disable />
-									<priority>1000</priority>
-								</interface>
-								<reset-tracking-bit />
-							</pim>
-						</protocols>
-					</instance>
-				</routing-instances>
-			</groups>
-		</configuration>
-	</config>
-\ No newline at end of file
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json
deleted file mode 100644
index 7113b70c2..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json
+++ /dev/null
@@ -1,639 +0,0 @@
-{
-	"metadata": {
-		"author": "ks220y@att.com",
-		"service-template-name": "vpe-201802-baseconfig",
-		"service-template-version": "1.0.0",
-		"release": "1802",
-		"service-type": "ADIOD",
-		"vnf-type": "VPE"
-	},
-	"topology_template": {
-		"inputs": {
-			"request-id": {
-				"required": true,
-				"type": "string"
-			},
-			"service-instance-id": {
-				"required": true,
-				"type": "string"
-			},
-			"action-name": {
-				"required": true,
-				"type": "string"
-			},
-			"scope-type": {
-				"required": true,
-				"type": "string"
-			},
-			"hostname": {
-				"required": true,
-				"type": "string"
-			},
-			"resource-assignment-request": {
-				"description": "This is Dynamic Data type for the receipe resource-assignment-action.",
-				"required": false,
-				"type": "dt-resource-assignment-request"
-			}
-		},
-		"node_templates": {
-			"base-config-template": {
-				"type": "artifact-config-template",
-				"properties": {
-					"action-names": [
-						"resource-assignment-action"
-					]
-				},
-				"capabilities": {
-					"content": {
-						"properties": {
-							"content": "db://base-config-template"
-						}
-					},
-					"mapping": {
-						"properties": {
-							"mapping": [
-								{
-									"name": "wan-aggregate-ipv6-addresses",
-									"input-param": true,
-									"property": {
-										"type": "list",
-										"entry_schema": {
-											"type": "dt-v6-aggregate"
-										}
-									},
-									"dictionary-name": "wan-aggregate-ipv6-addresses",
-									"dictionary-source": "input"
-								},
-								{
-									"name": "wan-aggregate-ipv4-addresses",
-									"input-param": true,
-									"property": {
-										"type": "list",
-										"entry_schema": {
-											"type": "dt-v4-aggregate"
-										}
-									},
-									"dictionary-name": "wan-aggregate-ipv4-addresses",
-									"dictionary-source": "input"
-								},
-								{
-									"name": "tacacs-server-ipv4-addresses",
-									"input-param": true,
-									"property": {
-										"type": "list",
-										"entry_schema": {
-											"type": "dt-tacacs-server-ipv4"
-										}
-									},
-									"dictionary-name": "tacacs-server-ipv4-addresses",
-									"dictionary-source": "input"
-								},
-								{
-									"name": "oam-remote-ipv4-address",
-									"property": {
-										"type": "string"
-									},
-									"dictionary-name": "oam-remote-ipv4-address",
-									"dictionary-source": "input"
-								},
-								{
-									"name": "si-local-ipv4-address",
-									"property": {
-										"type": "string"
-									},
-									"dictionary-name": "si-local-ipv4-address",
-									"dictionary-source": "input"
-								},
-								{
-									"name": "lo0-local-ipv4-address",
-									"property": {
-										"type": "string"
-									},
-									"dictionary-name": "lo0-local-ipv4-address",
-									"dictionary-source": "input"
-								},
-								{
-									"name": "asn-region",
-									"property": {
-										"type": "string"
-									},
-									"dictionary-name": "asn-region",
-									"dictionary-source": "input"
-								},
-								{
-									"name": "adiod-unicast-route-reflectors",
-									"input-param": true,
-									"property": {
-										"type": "list",
-										"entry_schema": {
-											"type": "dt-adiod-unicast-route-reflector"
-										}
-									},
-									"dictionary-name": "adiod-unicast-route-reflectors",
-									"dictionary-source": "input"
-								},
-								{
-									"name": "adiod-vpnv4-route-reflectors",
-									"input-param": true,
-									"property": {
-										"type": "list",
-										"entry_schema": {
-											"type": "dt-adiod-vpnv4-route-reflector"
-										}
-									},
-									"dictionary-name": "adiod-vpnv4-route-reflectors",
-									"dictionary-source": "input"
-								},
-								{
-									"name": "bundle-id",
-									"property": {
-										"type": "string"
-									},
-									"dictionary-name": "bundle-id",
-									"dictionary-source": "input"
-								},
-								{
-									"name": "uplink-1-unit",
-									"property": {
-										"type": "string"
-									},
-									"dictionary-name": "uplink-1-unit",
-									"dictionary-source": "input"
-								},
-								{
-									"name": "uplink-2-unit",
-									"property": {
-										"type": "string"
-									},
-									"dictionary-name": "uplink-2-unit",
-									"dictionary-source": "input"
-								},
-								{
-									"name": "ospf-area",
-									"property": {
-										"type": "string"
-									},
-									"dictionary-name": "ospf-area",
-									"dictionary-source": "input"
-								},
-								{
-									"name": "ospf-cost",
-									"property": {
-										"type": "string"
-									},
-									"dictionary-name": "ospf-cost",
-									"dictionary-source": "input"
-								},
-								{
-									"name": "lo10-local-ipv4-address",
-									"property": {
-										"type": "string"
-									},
-									"dictionary-name": "lo10-local-ipv4-address",
-									"dictionary-source": "input"
-								}
-							]
-						}
-					}
-				}
-			},
-			"resource-assignment-action": {
-				"type": "dg-resource-assignment",
-				"interfaces": {
-					"CONFIG": {
-						"operations": {
-							"ResourceAssignment": {
-								
-							}
-						}
-					}
-				},
-				"capabilities": {
-					"dg-node": {
-						
-					}
-				},
-				"requirements": {
-					"component-dependency": {
-						"capability": "component-node",
-						"node": "resource-assignment",
-						"relationship": "tosca.relationships.DependsOn"
-					}
-				}
-			},
-			"resource-assignment": {
-				"type": "component-resource-assignment",
-				"interfaces": {
-					"org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {
-						"operations": {
-							"process": {
-								"inputs": {
-									"action-name": "{ \"get_input\" : \"action-name\" }",
-									"resource-type": "vnf-type",
-									"template-names": [
-										"base-config-template",
-										"licence-template"
-									],
-									"request-id": "{ \"get_input\" : \"request-id\" }",
-									"resource-id": "{ \"get_input\" : \"hostname\" }"
-								},
-								"outputs": {
-									"resource-assignment-params": "",
-									"status": ""
-								}
-							}
-						}
-					}
-				},
-				"capabilities": {
-					"component-node": {
-						
-					}
-				}
-			}
-		}
-	},
-	"node_types": {
-		"dg-resource-assignment": {
-			"description": "This is Resource Assignment Directed Graph",
-			"version": "1.0.0",
-			"properties": {
-				"mode": {
-					"required": false,
-					"type": "string",
-					"default": "sync"
-				},
-				"version": {
-					"required": false,
-					"type": "string",
-					"default": "LATEST"
-				},
-				"is-start-flow": {
-					"required": false,
-					"type": "boolean",
-					"default": "false"
-				}
-			},
-			"capabilities": {
-				"dg-node": {
-					"type": "tosca.capabilities.Node"
-				},
-				"content": {
-					"type": "tosca.capabilities.Content",
-					"properties": {
-						"type": {
-							"required": false,
-							"type": "string",
-							"default": "json"
-						},
-						"content": {
-							"required": true,
-							"type": "string"
-						}
-					}
-				}
-			},
-			"requirements": {
-				"component-dependency": {
-					"capability": "component-node",
-					"node": "component-resource-assignment",
-					"relationship": "tosca.relationships.DependsOn"
-				}
-			},
-			"interfaces": {
-				"CONFIG": {
-					"operations": {
-						"ResourceAssignment": {
-							"inputs": {
-								"params": {
-									"required": false,
-									"type": "list",
-									"entry_schema": {
-										"type": "datatype-property"
-									}
-								}
-							}
-						}
-					}
-				}
-			},
-			"derived_from": "tosca.nodes.DG"
-		},
-		"component-resource-assignment": {
-			"description": "This is Resource Assignment Component API",
-			"version": "1.0.0",
-			"capabilities": {
-				"component-node": {
-					"type": "tosca.capabilities.Node"
-				}
-			},
-			"interfaces": {
-				"org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {
-					"operations": {
-						"process": {
-							"inputs": {
-								"action-name": {
-									"description": "Action Name to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",
-									"required": false,
-									"type": "string"
-								},
-								"handler-name": {
-									"description": "Name of the Artifact Node Template, to get the template Content. If template-content is present, then content wont be reterived from the Artifact Node Template.",
-									"required": true,
-									"type": "string"
-								},
-								"resource-type": {
-									"required": false,
-									"type": "string"
-								},
-								"template-names": {
-									"description": "Name of the Artifact Node Templates, to get the template Content.",
-									"required": true,
-									"type": "list",
-									"entry_schema": {
-										"type": "string"
-									}
-								},
-								"request-id": {
-									"description": "Request Id used to store the generated configuration, in the database along with the template-name",
-									"required": true,
-									"type": "string"
-								},
-								"resource-id": {
-									"description": "Id used to pull the data content from the data base. Either template-data or resource-id should be present",
-									"required": true,
-									"type": "string"
-								}
-							},
-							"outputs": {
-								"resource-assignment-params": {
-									"required": true,
-									"type": "string"
-								},
-								"status": {
-									"required": true,
-									"type": "string"
-								}
-							}
-						}
-					}
-				}
-			},
-			"derived_from": "tosca.nodes.Component"
-		},
-		"artifact-config-template": {
-			"description": "This is Configuration Velocity Template",
-			"version": "1.0.0",
-			"properties": {
-				"action-names": {
-					"required": true,
-					"type": "list",
-					"entry_schema": {
-						"type": "string"
-					}
-				}
-			},
-			"capabilities": {
-				"content": {
-					"type": "tosca.capabilities.Content",
-					"properties": {
-						"content": {
-							"required": true,
-							"type": "string"
-						}
-					}
-				},
-				"mapping": {
-					"type": "tosca.capabilities.Mapping",
-					"properties": {
-						"mapping": {
-							"required": false,
-							"type": "list",
-							"entry_schema": {
-								"type": "datatype-resource-assignment"
-							}
-						}
-					}
-				}
-			},
-			"derived_from": "tosca.nodes.Artifact"
-		}
-	},
-	"data_types": {
-		"dt-v4-aggregate": {
-			"version": "1.0.0",
-			"description": "This is dt-v4-aggregate Data Type",
-			"properties": {
-				"v4-address": {
-					"required": true,
-					"type": "string"
-				},
-				"v4-plen": {
-					"required": false,
-					"type": "integer"
-				}
-			},
-			"derived_from": "tosca.datatypes.Root"
-		},
-		"dt-tacacs-server-ipv4": {
-			"version": "1.0.0",
-			"description": "This is dt-tacacs-server-ipv4 Data Type",
-			"properties": {
-				"tacacs-server-ipv4-address": {
-					"required": true,
-					"type": "string"
-				}
-			},
-			"derived_from": "tosca.datatypes.Root"
-		},
-		"dt-adiod-vpnv4-route-reflector": {
-			"version": "1.0.0",
-			"description": "This is dt-adiod-unicast-route-reflector Data Type",
-			"properties": {
-				"v4-address": {
-					"required": true,
-					"type": "string"
-				},
-				"name": {
-					"required": false,
-					"type": "string"
-				}
-			},
-			"derived_from": "tosca.datatypes.Root"
-		},
-		"datatype-resource-assignment": {
-			"version": "1.0.0",
-			"description": "This is Resource Assignment Data Type",
-			"properties": {
-				"property": {
-					"required": true,
-					"type": "datatype-property"
-				},
-				"input-param": {
-					"required": true,
-					"type": "boolean"
-				},
-				"dictionary-name": {
-					"required": false,
-					"type": "string"
-				},
-				"dictionary-source": {
-					"required": false,
-					"type": "string"
-				},
-				"dependencies": {
-					"required": true,
-					"type": "list",
-					"entry_schema": {
-						"type": "string"
-					}
-				},
-				"status": {
-					"required": false,
-					"type": "string"
-				},
-				"message": {
-					"required": false,
-					"type": "string"
-				},
-				"updated-date": {
-					"required": false,
-					"type": "string"
-				},
-				"updated-by": {
-					"required": false,
-					"type": "string"
-				}
-			},
-			"derived_from": "tosca.datatypes.Root"
-		},
-		"dt-adiod-unicast-route-reflector": {
-			"version": "1.0.0",
-			"description": "This is dt-adiod-unicast-route-reflector Data Type",
-			"properties": {
-				"v4-address": {
-					"required": true,
-					"type": "string"
-				},
-				"name": {
-					"required": false,
-					"type": "string"
-				}
-			},
-			"derived_from": "tosca.datatypes.Root"
-		},
-		"datatype-property": {
-			"version": "1.0.0",
-			"description": "This is Entry point Input Data Type, which is dynamic datatype, The parameter names will be populated during the Design time for each inputs",
-			"properties": {
-				"type": {
-					"required": true,
-					"type": "string"
-				},
-				"description": {
-					"required": false,
-					"type": "string"
-				},
-				"required": {
-					"required": false,
-					"type": "boolean"
-				},
-				"default": {
-					"required": false,
-					"type": "string"
-				},
-				"entry_schema": {
-					"required": false,
-					"type": "string"
-				}
-			},
-			"derived_from": "tosca.datatypes.Root"
-		},
-		"dt-v6-aggregate": {
-			"version": "1.0.0",
-			"description": "This is dt-v6-aggregate Data Type",
-			"properties": {
-				"v6-address": {
-					"required": true,
-					"type": "string"
-				},
-				"v6-plen": {
-					"required": false,
-					"type": "string"
-				}
-			},
-			"derived_from": "tosca.datatypes.Root"
-		},
-		"dt-resource-assignment-request": {
-			"version": "1.0.0",
-			"description": "This is Dynamic Data type definition generated from resource mapping for the config template name base-config-template.",
-			"properties": {
-				"uplink-2-unit": {
-					"type": "string"
-				},
-				"bundle-mac": {
-					"required": true,
-					"type": "string"
-				},
-				"wan-aggregate-ipv6-addresses": {
-					"type": "list",
-					"entry_schema": {
-						"type": "dt-v6-aggregate"
-					}
-				},
-				"ospf-area": {
-					"type": "string"
-				},
-				"ospf-cost": {
-					"type": "string"
-				},
-				"bundle-id": {
-					"type": "string"
-				},
-				"adiod-unicast-route-reflectors": {
-					"type": "list",
-					"entry_schema": {
-						"type": "dt-adiod-unicast-route-reflector"
-					}
-				},
-				"oam-remote-ipv4-address": {
-					"type": "string"
-				},
-				"adiod-vpnv4-route-reflectors": {
-					"type": "list",
-					"entry_schema": {
-						"type": "dt-adiod-vpnv4-route-reflector"
-					}
-				},
-				"lo10-local-ipv4-address": {
-					"type": "string"
-				},
-				"wan-aggregate-ipv4-addresses": {
-					"type": "list",
-					"entry_schema": {
-						"type": "dt-v4-aggregate"
-					}
-				},
-				"lo0-local-ipv4-address": {
-					"type": "string"
-				},
-				"uplink-1-unit": {
-					"type": "string"
-				},
-				"tacacs-server-ipv4-addresses": {
-					"type": "list",
-					"entry_schema": {
-						"type": "dt-tacacs-server-ipv4"
-					}
-				},
-				"asn-region": {
-					"type": "string"
-				},
-				"si-local-ipv4-address": {
-					"type": "string"
-				}
-			},
-			"derived_from": "tosca.datatypes.Dynamic"
-		}
-	}
-}
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/validation/cyclic.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/validation/cyclic.json
deleted file mode 100644
index fc6357f2d..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/validation/cyclic.json
+++ /dev/null
@@ -1,111 +0,0 @@
-[
-	{
-		"name": "vnf-id",
-		"input-param": true,
-		"property": {
-			"type": "string",
-			"required": true
-		},
-		"dictionary-name": "vnf-id",
-		"dictionary-source": "input",
-		"dependencies": []
-	},
-	{
-		"name": "service-instance-id",
-		"input-param": true,
-		"property": {
-			"type": "string",
-			"required": true
-		},
-		"dictionary-name": "service-instance-id",
-		"dictionary-source": "input",
-		"dependencies": []
-	},
-	{
-		"name": "bundle-id",
-		"input-param": true,
-		"property": {
-			"type": "string",
-			"required": true
-		},
-		"dictionary-name": "bundle-id",
-		"dictionary-source": "mdsal",
-		"dependencies": [
-			"vnf-id"
-		]
-	},
-	{
-		"name": "bundle-ip",
-		"input-param": true,
-		"property": {
-			"type": "string",
-			"required": true
-		},
-		"dictionary-name": "bundle-ip",
-		"dictionary-source": "mdsal",
-		"dependencies": [
-			"vnf-id"
-		]
-	},
-	{
-		"name": "bundle-mac",
-		"input-param": true,
-		"property": {
-			"type": "string"
-		},
-		"dictionary-name": "bundle-mac",
-		"dictionary-source": "mdsal",
-		"dependencies": [
-			"vnf-id",
-			"bundle-id"
-		]
-	},
-	{
-		"name": "managed-ip",
-		"input-param": true,
-		"property": {
-			"type": "string"
-		},
-		"dictionary-name": "managed-ip",
-		"dictionary-source": "mdsal",
-		"dependencies": [
-			"loopback-ip"
-		]
-	},
-	{
-		"name": "vnf-name",
-		"input-param": true,
-		"property": {
-			"type": "string",
-			"required": true
-		},
-		"dictionary-name": "vnf-name",
-		"dictionary-source": "input",
-		"dependencies": []
-	},
-	{
-		"name": "managed-ip1",
-		"input-param": true,
-		"property": {
-			"type": "string"
-		},
-		"dictionary-name": "managed-ip1",
-		"dictionary-source": "mdsal",
-		"dependencies": [
-			"loopback-ip"
-		]
-	},
-	{
-		"name": "loopback-ip",
-		"input-param": true,
-		"property": {
-			"type": "string"
-		},
-		"dictionary-name": "loopback-ip",
-		"dictionary-source": "db",
-		"dependencies": [
-			"bundle-mac",
-			"managed-ip1"
-		]
-	}
-]
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/validation/duplicate.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/validation/duplicate.json
deleted file mode 100644
index 86909a6a4..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/validation/duplicate.json
+++ /dev/null
@@ -1,110 +0,0 @@
-[
-	{
-		"name": "vnf-id",
-		"input-param": true,
-		"property": {
-			"type": "string",
-			"required": true
-		},
-		"dictionary-name": "vnf-id",
-		"dictionary-source": "input",
-		"dependencies": []
-	},
-	{
-		"name": "service-instance-id",
-		"input-param": true,
-		"property": {
-			"type": "string",
-			"required": true
-		},
-		"dictionary-name": "service-instance-id",
-		"dictionary-source": "input",
-		"dependencies": []
-	},
-	{
-		"name": "bundle-id",
-		"input-param": true,
-		"property": {
-			"type": "string",
-			"required": true
-		},
-		"dictionary-name": "bundle-id",
-		"dictionary-source": "mdsal",
-		"dependencies": [
-			"vnf-id"
-		]
-	},
-	{
-		"name": "bundle-ip",
-		"input-param": true,
-		"property": {
-			"type": "string",
-			"required": true
-		},
-		"dictionary-name": "bundle-ip",
-		"dictionary-source": "mdsal",
-		"dependencies": [
-			"vnf-id"
-		]
-	},
-	{
-		"name": "bundle-mac",
-		"input-param": true,
-		"property": {
-			"type": "string"
-		},
-		"dictionary-name": "bundle-mac",
-		"dictionary-source": "mdsal",
-		"dependencies": [
-			"vnf-id",
-			"bundle-id"
-		]
-	},
-	{
-		"name": "bundle-mac",
-		"input-param": true,
-		"property": {
-			"type": "string"
-		},
-		"dictionary-name": "bundle-mac",
-		"dictionary-source": "mdsal",
-		"dependencies": [
-			"loopback-ip"
-		]
-	},
-	{
-		"name": "vnf-name",
-		"input-param": true,
-		"property": {
-			"type": "string",
-			"required": true
-		},
-		"dictionary-name": "vnf-name",
-		"dictionary-source": "input",
-		"dependencies": []
-	},
-	{
-		"name": "managed-ip1",
-		"input-param": true,
-		"property": {
-			"type": "string"
-		},
-		"dictionary-name": "managed-ip1",
-		"dictionary-source": "mdsal",
-		"dependencies": [
-			"loopback-ip"
-		]
-	},
-	{
-		"name": "loopback-ip",
-		"input-param": true,
-		"property": {
-			"type": "string"
-		},
-		"dictionary-name": "loopback-ip",
-		"dictionary-source": "db",
-		"dependencies": [
-			"bundle-mac"
-		]
-	}
-]
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/validation/success.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/validation/success.json
deleted file mode 100644
index e08539c0d..000000000
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/validation/success.json
+++ /dev/null
@@ -1,110 +0,0 @@
-[
-	{
-		"name": "vnf-id",
-		"input-param": true,
-		"property": {
-			"type": "string",
-			"required": true
-		},
-		"dictionary-name": "vnf-id",
-		"dictionary-source": "input",
-		"dependencies": []
-	},
-	{
-		"name": "service-instance-id",
-		"input-param": true,
-		"property": {
-			"type": "string",
-			"required": true
-		},
-		"dictionary-name": "service-instance-id",
-		"dictionary-source": "input",
-		"dependencies": []
-	},
-	{
-		"name": "bundle-id",
-		"input-param": true,
-		"property": {
-			"type": "string",
-			"required": true
-		},
-		"dictionary-name": "bundle-id",
-		"dictionary-source": "mdsal",
-		"dependencies": [
-			"vnf-id"
-		]
-	},
-	{
-		"name": "bundle-ip",
-		"input-param": true,
-		"property": {
-			"type": "string",
-			"required": true
-		},
-		"dictionary-name": "bundle-ip",
-		"dictionary-source": "mdsal",
-		"dependencies": [
-			"vnf-id"
-		]
-	},
-	{
-		"name": "bundle-mac",
-		"input-param": true,
-		"property": {
-			"type": "string"
-		},
-		"dictionary-name": "bundle-mac",
-		"dictionary-source": "mdsal",
-		"dependencies": [
-			"vnf-id",
-			"bundle-id"
-		]
-	},
-	{
-		"name": "managed-ip",
-		"input-param": true,
-		"property": {
-			"type": "string"
-		},
-		"dictionary-name": "managed-ip",
-		"dictionary-source": "mdsal",
-		"dependencies": [
-			"loopback-ip"
-		]
-	},
-	{
-		"name": "vnf-name",
-		"input-param": true,
-		"property": {
-			"type": "string",
-			"required": true
-		},
-		"dictionary-name": "vnf-name",
-		"dictionary-source": "input",
-		"dependencies": []
-	},
-	{
-		"name": "managed-ip1",
-		"input-param": true,
-		"property": {
-			"type": "string"
-		},
-		"dictionary-name": "managed-ip1",
-		"dictionary-source": "mdsal",
-		"dependencies": [
-			"loopback-ip"
-		]
-	},
-	{
-		"name": "loopback-ip",
-		"input-param": true,
-		"property": {
-			"type": "string"
-		},
-		"dictionary-name": "loopback-ip",
-		"dictionary-source": "db",
-		"dependencies": [
-			"bundle-mac"
-		]
-	}
-]