Merge master into tosca-poc branch

This review was created with the commands:
git co master
git pull
git co tosca-poc
git pull
git merge -X theirs master

With this merge, the CLAMP master branch is merged into tosca-poc, and,
apart from the tosca-controlloop directory, they are identical

Issue-ID: POLICY-3215
Change-Id: Iaa1c4894b33508f8bb75b7d1c0dd414964497625
Signed-off-by: liamfallon <liam.fallon@est.tech>

30 files changed, 0 insertions, 6386 deletions

diff --git a/src/test/resources/tosca/micro-service-policy-payload.json b/src/test/resources/tosca/micro-service-policy-payload.json
deleted file mode 100644
index 2533a5410..000000000
--- a/src/test/resources/tosca/micro-service-policy-payload.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"tosca_definitions_version": "tosca_simple_yaml_1_0_0",
-	"topology_template": {
-		"policies": [
-			{
-				"testPolicy": {
-					"type": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-					"type_version": "1.0.0",
-					"version": "1.0.0",
-					"metadata": {
-						"policy-id": "testPolicy"
-					},
-					"properties": {
-						"tca_policy": {
-							"domain": "measurementsForVfScaling",
-							"metricsPerEventName": [
-								{
-									"policyVersion": "1.0.0",
-									"thresholds": [
-										{
-											"severity": "CRITICAL",
-											"fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
-											"thresholdValue": 1,
-											"closedLoopEventStatus": "ONSET",
-											"closedLoopControlName": "test",
-											"version": "1.0.0",
-											"direction": "LESS"
-										}
-									],
-									"policyName": "test",
-									"controlLoopSchemaType": "VM",
-									"policyScope": "test",
-									"eventName": "test"
-								}
-							]
-						}
-					}
-				}
-			}
-		]
-	}
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/micro-service-policy-properties.json b/src/test/resources/tosca/micro-service-policy-properties.json
deleted file mode 100644
index 04fe0cc7f..000000000
--- a/src/test/resources/tosca/micro-service-policy-properties.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "tca_policy": {
-    "domain": "measurementsForVfScaling",
-    "metricsPerEventName": [
-      {
-        "policyVersion": "1.0.0",
-        "thresholds": [
-          {
-            "severity": "CRITICAL",
-            "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
-            "thresholdValue": 1,
-            "closedLoopEventStatus": "ONSET",
-            "closedLoopControlName": "test",
-            "version": "1.0.0",
-            "direction": "LESS"
-          }
-        ],
-        "policyName": "test",
-        "controlLoopSchemaType": "VM",
-        "policyScope": "test",
-        "eventName": "test"
-      }
-    ]
-  }
-}
diff --git a/src/test/resources/tosca/model-properties-cds.json b/src/test/resources/tosca/model-properties-cds.json
deleted file mode 100644
index fea658431..000000000
--- a/src/test/resources/tosca/model-properties-cds.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
-	"serviceDetails": {
-		"serviceType": "",
-		"namingPolicy": "",
-		"environmentContext": "General_Revenue-Bearing",
-		"serviceEcompNaming": "true",
-		"serviceRole": "",
-		"name": "vLoadBalancerMS",
-		"description": "vLBMS",
-		"invariantUUID": "30ec5b59-4799-48d8-ac5f-1058a6b0e48f",
-		"ecompGeneratedNaming": "true",
-		"category": "Network L4+",
-		"type": "Service",
-		"UUID": "63cac700-ab9a-4115-a74f-7eac85e3fce0",
-		"instantiationType": "A-la-carte"
-	},
-	"resourceDetails": {
-		"CP": {},
-		"VL": {},
-		"VF": {
-			"vLoadBalancerMS 0": {
-				"resourceVendor": "Test",
-				"resourceVendorModelNumber": "",
-				"name": "vLoadBalancerMS",
-				"description": "vLBMS",
-				"invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
-				"subcategory": "Load Balancer",
-				"category": "Application L4+",
-				"type": "VF",
-				"UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
-				"version": "1.0",
-				"resourceVendorRelease": "1.0",
-				"customizationUUID": "465246dc-7748-45f4-a013-308d92922552",
-				"controllerProperties": {
-					"sdnc_model_name": "baseconfiguration",
-					"sdnc_model_version": "1.0.0",
-					"workflows": {
-						"resource-assignment": {
-							"inputs": {
-								"template-prefix": {
-									"required": true,
-									"type": "list",
-									"entry_schema": {
-										"type": "string"
-									}
-								},
-								"template-prefix-with-complex-type": {
-									"type": "list",
-									"properties": {
-										"prefix-id": {
-											"description": "",
-											"required": false,
-											"type": "string",
-											"status": "",
-											"constraints": [
-												{}
-											],
-											"entry_schema": {
-												"type": ""
-											}
-										}
-									}
-								},
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"private1-prefix-id": {
-											"description": "",
-											"required": false,
-											"type": "string",
-											"status": "",
-											"constraints": [
-												{}
-											],
-											"entry_schema": {
-												"type": ""
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		},
-		"CR": {},
-		"VFC": {},
-		"PNF": {},
-		"Service": {},
-		"CVFC": {},
-		"Service Proxy": {},
-		"Configuration": {},
-		"AllottedResource": {},
-		"VFModule": {
-			"Vloadbalancerms..vpkg..module-1": {
-				"vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
-				"vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-				"vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
-				"min_vf_module_instances": 0,
-				"vf_module_label": "vpkg",
-				"max_vf_module_instances": 1,
-				"vf_module_type": "Expansion",
-				"isBase": false,
-				"initial_count": 0,
-				"volume_group": false
-			},
-			"Vloadbalancerms..vdns..module-3": {
-				"vfModuleModelInvariantUUID": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..vdns..module-3",
-				"vfModuleModelUUID": "4fa73b49-8a6c-493e-816b-eb401567b720",
-				"vfModuleModelCustomizationUUID": "bafcdab0-801d-4d81-9ead-f464640a38b1",
-				"min_vf_module_instances": 0,
-				"vf_module_label": "vdns",
-				"max_vf_module_instances": 50,
-				"vf_module_type": "Expansion",
-				"isBase": false,
-				"initial_count": 0,
-				"volume_group": false
-			},
-			"Vloadbalancerms..base_template..module-0": {
-				"vfModuleModelInvariantUUID": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..base_template..module-0",
-				"vfModuleModelUUID": "63734409-f745-4e4d-a38b-131638a0edce",
-				"vfModuleModelCustomizationUUID": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
-				"min_vf_module_instances": 1,
-				"vf_module_label": "base_template",
-				"max_vf_module_instances": 1,
-				"vf_module_type": "Base",
-				"isBase": true,
-				"initial_count": 1,
-				"volume_group": false
-			},
-			"Vloadbalancerms..vlb..module-2": {
-				"vfModuleModelInvariantUUID": "a772a1f4-0064-412c-833d-4749b15828dd",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..vlb..module-2",
-				"vfModuleModelUUID": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
-				"vfModuleModelCustomizationUUID": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
-				"min_vf_module_instances": 0,
-				"vf_module_label": "vlb",
-				"max_vf_module_instances": 1,
-				"vf_module_type": "Expansion",
-				"isBase": false,
-				"initial_count": 0,
-				"volume_group": false
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/model-properties-operational-policy.json b/src/test/resources/tosca/model-properties-operational-policy.json
deleted file mode 100644
index 2a6568528..000000000
--- a/src/test/resources/tosca/model-properties-operational-policy.json
+++ /dev/null
@@ -1,353 +0,0 @@
-{
-	"serviceDetails": {
-		"serviceType": "",
-		"namingPolicy": "",
-		"environmentContext": "General_Revenue-Bearing",
-		"serviceEcompNaming": "true",
-		"serviceRole": "",
-		"name": "vLoadBalancerMS",
-		"description": "vLBMS",
-		"invariantUUID": "30ec5b59-4799-48d8-ac5f-1058a6b0e48f",
-		"ecompGeneratedNaming": "true",
-		"category": "Network L4+",
-		"type": "Service",
-		"UUID": "63cac700-ab9a-4115-a74f-7eac85e3fce0",
-		"instantiationType": "A-la-carte"
-	},
-	"resourceDetails": {
-		"CP": {
-		},
-		"VL": {
-		},
-		"VF": {
-			"vLoadBalancerMS 0": {
-				"resourceVendor": "Test",
-				"resourceVendorModelNumber": "",
-				"name": "vLoadBalancerMS",
-				"description": "vLBMS",
-				"invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
-				"subcategory": "Load Balancer",
-				"category": "Application L4+",
-				"type": "VF",
-				"UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
-				"version": "1.0",
-				"resourceVendorRelease": "1.0",
-				"customizationUUID": "465246dc-7748-45f4-a013-308d92922552",
-				"controllerProperties": {
-					"sdnc_model_name": "baseconfiguration",
-					"sdnc_model_version": "1.0.0",
-					"workflows": {
-						"resource-assignment": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate": {
-							"inputs": {
-								"activate-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate-restconf": {
-							"inputs": {
-								"activate-restconf-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate-cli": {
-							"inputs": {
-								"activate-cli-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"assign-activate": {
-							"inputs": {
-								"assign-activate-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"imperative-test-wf": {
-							"inputs": {
-								"imperative-test-wf-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		},
-		"CR": {
-		},
-		"VFC": {
-		},
-		"PNF": {
-		},
-		"Service": {
-		},
-		"CVFC": {
-		},
-		"Service Proxy": {
-		},
-		"Configuration": {
-		},
-		"AllottedResource": {
-		},
-		"VFModule": {
-			"Vloadbalancerms..vpkg..module-1": {
-				"vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
-				"vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-				"vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
-				"min_vf_module_instances": 0,
-				"vf_module_label": "vpkg",
-				"max_vf_module_instances": 1,
-				"vf_module_type": "Expansion",
-				"isBase": false,
-				"initial_count": 0,
-				"volume_group": false
-			},
-			"Vloadbalancerms..vdns..module-3": {
-				"vfModuleModelInvariantUUID": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..vdns..module-3",
-				"vfModuleModelUUID": "4fa73b49-8a6c-493e-816b-eb401567b720",
-				"vfModuleModelCustomizationUUID": "bafcdab0-801d-4d81-9ead-f464640a38b1",
-				"min_vf_module_instances": 0,
-				"vf_module_label": "vdns",
-				"max_vf_module_instances": 50,
-				"vf_module_type": "Expansion",
-				"isBase": false,
-				"initial_count": 0,
-				"volume_group": false
-			},
-			"Vloadbalancerms..base_template..module-0": {
-				"vfModuleModelInvariantUUID": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..base_template..module-0",
-				"vfModuleModelUUID": "63734409-f745-4e4d-a38b-131638a0edce",
-				"vfModuleModelCustomizationUUID": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
-				"min_vf_module_instances": 1,
-				"vf_module_label": "base_template",
-				"max_vf_module_instances": 1,
-				"vf_module_type": "Base",
-				"isBase": true,
-				"initial_count": 1,
-				"volume_group": false
-			},
-			"Vloadbalancerms..vlb..module-2": {
-				"vfModuleModelInvariantUUID": "a772a1f4-0064-412c-833d-4749b15828dd",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..vlb..module-2",
-				"vfModuleModelUUID": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
-				"vfModuleModelCustomizationUUID": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
-				"min_vf_module_instances": 0,
-				"vf_module_label": "vlb",
-				"max_vf_module_instances": 1,
-				"vf_module_type": "Expansion",
-				"isBase": false,
-				"initial_count": 0,
-				"volume_group": false
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/model-properties.json b/src/test/resources/tosca/model-properties.json
deleted file mode 100644
index 1c0fe24b4..000000000
--- a/src/test/resources/tosca/model-properties.json
+++ /dev/null
@@ -1,353 +0,0 @@
-{
-	"serviceDetails": {
-		"serviceType": "",
-		"namingPolicy": "",
-		"environmentContext": "General_Revenue-Bearing",
-		"serviceEcompNaming": "true",
-		"serviceRole": "",
-		"name": "vLoadBalancerMS",
-		"description": "vLBMS",
-		"invariantUUID": "30ec5b59-4799-48d8-ac5f-1058a6b0e48f",
-		"ecompGeneratedNaming": "true",
-		"category": "Network L4+",
-		"type": "Service",
-		"UUID": "63cac700-ab9a-4115-a74f-7eac85e3fce0",
-		"instantiationType": "A-la-carte"
-	},
-	"resourceDetails": {
-		"CP": {
-		},
-		"VL": {
-		},
-		"VF": {
-			"vLoadBalancerMS 0": {
-				"resourceVendor": "Test",
-				"resourceVendorModelNumber": "",
-				"name": "vLoadBalancerMS",
-				"description": "vLBMS",
-				"invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
-				"subcategory": "Load Balancer",
-				"category": "Application L4+",
-				"type": "VF",
-				"UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
-				"version": "1.0",
-				"resourceVendorRelease": "1.0",
-				"customizationUUID": "465246dc-7748-45f4-a013-308d92922552",
-				"controllerProperties": {
-					"sdnc_model_name": "baseconfiguration",
-					"sdnc_model_version": "1.0.0",
-					"workflows": {
-						"resource-assignment": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate-restconf": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate-cli": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"assign-activate": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"imperative-test-wf": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		},
-		"CR": {
-		},
-		"VFC": {
-		},
-		"PNF": {
-		},
-		"Service": {
-		},
-		"CVFC": {
-		},
-		"Service Proxy": {
-		},
-		"Configuration": {
-		},
-		"AllottedResource": {
-		},
-		"VFModule": {
-			"Vloadbalancerms..vpkg..module-1": {
-				"vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
-				"vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-				"vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
-				"min_vf_module_instances": 0,
-				"vf_module_label": "vpkg",
-				"max_vf_module_instances": 1,
-				"vf_module_type": "Expansion",
-				"isBase": false,
-				"initial_count": 0,
-				"volume_group": false
-			},
-			"Vloadbalancerms..vdns..module-3": {
-				"vfModuleModelInvariantUUID": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..vdns..module-3",
-				"vfModuleModelUUID": "4fa73b49-8a6c-493e-816b-eb401567b720",
-				"vfModuleModelCustomizationUUID": "bafcdab0-801d-4d81-9ead-f464640a38b1",
-				"min_vf_module_instances": 0,
-				"vf_module_label": "vdns",
-				"max_vf_module_instances": 50,
-				"vf_module_type": "Expansion",
-				"isBase": false,
-				"initial_count": 0,
-				"volume_group": false
-			},
-			"Vloadbalancerms..base_template..module-0": {
-				"vfModuleModelInvariantUUID": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..base_template..module-0",
-				"vfModuleModelUUID": "63734409-f745-4e4d-a38b-131638a0edce",
-				"vfModuleModelCustomizationUUID": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
-				"min_vf_module_instances": 1,
-				"vf_module_label": "base_template",
-				"max_vf_module_instances": 1,
-				"vf_module_type": "Base",
-				"isBase": true,
-				"initial_count": 1,
-				"volume_group": false
-			},
-			"Vloadbalancerms..vlb..module-2": {
-				"vfModuleModelInvariantUUID": "a772a1f4-0064-412c-833d-4749b15828dd",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..vlb..module-2",
-				"vfModuleModelUUID": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
-				"vfModuleModelCustomizationUUID": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
-				"min_vf_module_instances": 0,
-				"vf_module_label": "vlb",
-				"max_vf_module_instances": 1,
-				"vf_module_type": "Expansion",
-				"isBase": false,
-				"initial_count": 0,
-				"volume_group": false
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/new-converter/constraints.yaml b/src/test/resources/tosca/new-converter/constraints.yaml
deleted file mode 100644
index 7a94ca965..000000000
--- a/src/test/resources/tosca/new-converter/constraints.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0

-policy_types:

-    onap.policies.controlloop.operational.common.Drools:

-        derived_from: onap.policies.controlloop.operational.Common

-        type_version: 1.0.0

-        version: 1.0.0

-        description: Operational policies for Drools PDP

-        properties:

-            controllerName:

-                type: String

-                description: Drools controller properties

-                required: true

-data_types:

-    onap.datatype.controlloop.Operation:

-        derived_from: tosca.datatypes.Root

-        description: An operation supported by an actor

-        properties:

-            id:

-                type: String

-                description: Unique identifier for the operation

-                required: true

-                constraints:

-                - length: 8

-            description:

-                type: Array

-                description: A user-friendly description of the intent for the operation

-                required: false

-                constraints:

-                - min_length: 5

-                - max_length: 7

-            test:

-                type: Integer

-                description: |

-                    Overall timeout for executing all the operations. This timeout should equal or exceed the total

-                    timeout for each operation listed.

-                required: true

-                constraints:

-                    - greater_than: 7

-                    - greater_or_equal: 1

-                    - less_than: 7

-                    - less_or_equal: 1

-            timeout:

-                type: Integer

-                description: The amount of time for the actor to perform the operation.

-                required: true

-                constraints:

-                - valid_values: [3,4,5.5,6,10]

-            retries:

-                type: Integer

-                description: The number of retries the actor should attempt to perform the operation.

-                required: true

-                default: 0

-                constraints:

-                - equal: 5

-            success:

-                type: String

-                description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation.

-                required: false

-                constraints:

-                - valid_values: [VALID,TERMINATED]

diff --git a/src/test/resources/tosca/new-converter/sampleOperationalPolicies.yaml b/src/test/resources/tosca/new-converter/sampleOperationalPolicies.yaml
deleted file mode 100644
index c2afeccdc..000000000
--- a/src/test/resources/tosca/new-converter/sampleOperationalPolicies.yaml
+++ /dev/null
@@ -1,160 +0,0 @@
-

-tosca_definitions_version: tosca_simple_yaml_1_0_0

-policy_types:

-    onap.policies.controlloop.operational.Common:

-        derived_from: tosca.policies.Root

-        version: 1.0.0

-        description: Operational Policy for Control Loop execution

-        properties:

-            id:

-                type: String

-                description: The unique control loop id.

-                required: true

-            timeout:

-                type: Integer

-                description: |

-                    Overall timeout for executing all the operations. This timeout should equal or exceed the total

-                    timeout for each operation listed.

-                required: true

-            abatement:

-                type: Boolean

-                description: Whether an abatement event message will be expected for the control loop from DCAE.

-                required: true

-                default: false

-            trigger:

-                type: String

-                description: Initial operation to execute upon receiving an Onset event message for the Control Loop.

-                required: true

-            operations:

-                type: List

-                description: List of operations to be performed when Control Loop is triggered.

-                required: true

-                entry_schema:

-                    type: onap.datatype.controlloop.Operation

-    onap.policies.controlloop.operational.common.Drools:

-        derived_from: onap.policies.controlloop.operational.Common

-        type_version: 1.0.0

-        version: 1.0.0

-        description: Operational policies for Drools PDP

-        properties:

-            controllerName:

-                type: String

-                description: Drools controller properties

-                required: false

-data_types:

-    # TBD if this is needed

-    onap.datatype.controlloop.operation.Failure:

-        derived_from: tosca.datatypes.Root

-        description: Captures information of an operational failure performed for control loop

-        properties:

-            messages:

-                type: String

-                description: error message

-                required: true

-            category:

-                type: String

-                description: |

-                    The category the error occurred in. Whether this is a general error from the actor, or the operation

-                    timed out, retries were exhausted in trying to execute the operation, a guard policy prevented the

-                    operation from occuring, or an exception in the system caused the failure.

-                constraints:

-                - valid_values: [error, timeout, retries, guard, exception]

-    onap.datatype.controlloop.Target:

-        derived_from: tosca.datatypes.Root

-        description: Definition for a entity in A&AI to perform a control loop operation on

-        properties:

-            targetType:

-                type: String

-                description: Category for the target type

-                required: true

-                constraints:

-                - valid_values: [VNF, VM, VFMODULE, PNF]

-            entityIds:

-                type: Map

-                description: |

-                    Map of values that identify the resource. If none are provided, it is assumed that the

-                    entity that generated the ONSET event will be the target.

-                required: false

-                entry_schema:

-                    type: String

-    onap.datatype.controlloop.Actor:

-        derived_from: tosca.datatypes.Root

-        description: An actor/operation/target definition

-        properties:

-            actor:

-                type: String

-                description: The actor performing the operation.

-                required: true

-            operation:

-                type: String

-                description: The operation the actor is performing.

-                required: true

-            target:

-                type: String

-                description: The resource the operation should be performed on.

-                required: true

-                metadata:

-                    clamp_possible_values: <string:see clamp project for syntax>

-            payload:

-                type: Map

-                description: Name/value pairs of payload information passed by Policy to the actor

-                required: false

-                entry_schema:

-                    type: String

-    onap.datatype.controlloop.Operation:

-        derived_from: tosca.datatypes.Root

-        description: An operation supported by an actor

-        properties:

-            id:

-                type: String

-                description: Unique identifier for the operation

-                required: true

-            description:

-                type: String

-                description: A user-friendly description of the intent for the operation

-                required: false

-            operation:

-                type: onap.datatype.controlloop.Actor

-                description: The definition of the operation to be performed.

-                required: true

-                metadata:

-                    clamp_possible_values: <string:see clamp project for syntax>

-            timeout:

-                type: Integer

-                description: The amount of time for the actor to perform the operation.

-                required: true

-            retries:

-                type: Integer

-                description: The number of retries the actor should attempt to perform the operation.

-                required: true

-                default: 0

-            success:

-                type: String

-                description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation.

-                required: false

-                default: final_success

-            failure:

-                type: String

-                description: Points to the operation to invoke on Actor operation failure.

-                required: false

-                default: final_failure

-            failure_timeout:

-                type: String

-                description: Points to the operation to invoke when the time out for the operation occurs.

-                required: false

-                default: final_failure_timeout

-            failure_retries:

-                type: String

-                description: Points to the operation to invoke when the current operation has exceeded its max retries.

-                required: false

-                default: final_failure_retries

-            failure_exception:

-                type: String

-                description: Points to the operation to invoke when the current operation causes an exception.

-                required: false

-                default: final_failure_exception

-            failure_guard:

-                type: String

-                description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.

-                required: false

-                default: final_failure_guard

diff --git a/src/test/resources/tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml b/src/test/resources/tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml
deleted file mode 100644
index 780acadc2..000000000
--- a/src/test/resources/tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml
+++ /dev/null
@@ -1,174 +0,0 @@
-
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-  onap.policies.controlloop.operational.Common:
-    derived_from: onap.datatype.controlloop.operation.Failure
-    version: 1.0.0
-    description: Operational Policy for Control Loop execution
-    properties:
-      id:
-        type: String
-        description: The unique control loop id.
-        required: true
-      timeout:
-        type: Integer
-        description: |
-          Overall timeout for executing all the operations. This timeout should equal or exceed the total
-          timeout for each operation listed.
-        required: true
-        constraints:
-          - valid_values: [1, 2, 5]
-          - equal: 5
-          - greater_than: 7
-          - greater_or_equal: 1
-          - less_than: 7
-          - less_or_equal: 1
-      abatement:
-        type: Boolean
-        description: Whether an abatement event message will be expected for the control loop from DCAE.
-        required: true
-        default: false
-      trigger:
-        type: String
-        description: Initial operation to execute upon receiving an Onset event message for the Control Loop.
-        required: true
-      operations:
-        type: List
-        description: List of operations to be performed when Control Loop is triggered.
-        required: true
-        entry_schema:
-          type: onap.datatype.controlloop.Operation
-  onap.policies.controlloop.operational.common.Drools:
-    derived_from: onap.policies.controlloop.operational.Common
-    type_version: 1.0.0
-    version: 1.0.0
-    description: Operational policies for Drools PDP
-    properties:
-      controllerName:
-        type: String
-        description: Drools controller properties
-        required: true
-data_types:
-  # TBD if this is needed
-  onap.datatype.controlloop.operation.Failure:
-    derived_from: onap.datatype.controlloop.Target
-    description: Captures information of an operational failure performed for control loop
-    properties:
-      messages:
-        type: String
-        description: error message
-        required: true
-      category:
-        type: String
-        description: |
-          The category the error occurred in. Whether this is a general error from the actor, or the operation
-          timed out, retries were exhausted in trying to execute the operation, a guard policy prevented the
-          operation from occuring, or an exception in the system caused the failure.
-        constraints:
-          - valid_values: [error, timeout, retries, guard, exception]
-  onap.datatype.controlloop.Target:
-    derived_from: tosca.datatypes.Root
-    description: Definition for a entity in A&AI to perform a control loop operation on
-    properties:
-      targetType:
-        type: String
-        description: Category for the target type
-        required: true
-        constraints:
-          - valid_values: [VNF, VM, VFMODULE, PNF]
-      entityIds:
-        type: Map
-        description: |
-          Map of values that identify the resource. If none are provided, it is assumed that the
-          entity that generated the ONSET event will be the target.
-        required: false
-        entry_schema:
-          type: String
-  onap.datatype.controlloop.Actor:
-    derived_from: tosca.datatypes.Root
-    description: An actor/operation/target definition
-    properties:
-      actor:
-        type: String
-        description: The actor performing the operation.
-        required: true
-        default: [1,"String",5.5,true]
-      operation:
-        type: String
-        description: The operation the actor is performing.
-        required: true
-      target:
-        type: String
-        description: The resource the operation should be performed on.
-        required: true
-        metadata:
-          clamp_possible_values: <string:see clamp project for syntax>
-      payload:
-        type: Map
-        description: Name/value pairs of payload information passed by Policy to the actor
-        required: false
-        entry_schema:
-          type: String
-  onap.datatype.controlloop.Operation:
-    derived_from: tosca.datatypes.Root
-    description: An operation supported by an actor
-    properties:
-      id:
-        type: String
-        description: Unique identifier for the operation
-        required: true
-      description:
-        type: Array
-        description: A user-friendly description of the intent for the operation
-        required: false
-        constraints:
-          - min_length: 5
-          - max_length: 7
-          - length: 1
-      operation:
-        type: onap.datatype.controlloop.Actor
-        description: The definition of the operation to be performed.
-        required: true
-        metadata:
-          clamp_possible_values: <string:see clamp project for syntax>
-      timeout:
-        type: Integer
-        description: The amount of time for the actor to perform the operation.
-        required: true
-        constraints:
-          - valid_values: [3, 4, 5.5, 6, 10]
-      retries:
-        type: Integer
-        description: The number of retries the actor should attempt to perform the operation.
-        required: true
-        default: 0
-      success:
-        type: String
-        description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation.
-        required: false
-        default: final_success
-      failure:
-        type: String
-        description: Points to the operation to invoke on Actor operation failure.
-        required: false
-        default: final_failure
-      failure_timeout:
-        type: String
-        description: Points to the operation to invoke when the time out for the operation occurs.
-        required: false
-        default: final_failure_timeout
-      failure_retries:
-        type: String
-        description: Points to the operation to invoke when the current operation has exceeded its max retries.
-        required: false
-        default: final_failure_retries
-      failure_exception:
-        type: String
-        description: Points to the operation to invoke when the current operation causes an exception.
-        required: false
-        default: final_failure_exception
-      failure_guard:
-        type: String
-        description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.
-        required: false
-        default: final_failure_guard
diff --git a/src/test/resources/tosca/new-converter/tca-with-metadata.json b/src/test/resources/tosca/new-converter/tca-with-metadata.json
deleted file mode 100644
index 3a700c8ee..000000000
--- a/src/test/resources/tosca/new-converter/tca-with-metadata.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "title": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-  "type": "object",
-  "required": [],
-  "properties": {
-    "tca_policy": {
-      "type": "object",
-      "description": "TCA Policy JSON",
-      "properties": {
-        "onap.datatypes.monitoring.tca_policy": {
-          "title": "onap.datatypes.monitoring.tca_policy",
-          "type": "object",
-          "required": [
-            "domain",
-            "metricsPerEventName"
-          ],
-          "properties": {
-            "domain": {
-              "type": "string",
-              "description": "Domain name to which TCA needs to be applied",
-              "default": "measurementsForVfScaling",
-              "const": "measurementsForVfScaling"
-            },
-            "metricsPerEventName": {
-              "type": "array",
-              "description": "Contains eventName and threshold details that need to be applied to given eventName",
-              "items": {
-                "title": "onap.datatypes.monitoring.metricsPerEventName",
-                "type": "object",
-                "required": [
-                  "controlLoopSchemaType",
-                  "eventName",
-                  "policyName",
-                  "policyScope",
-                  "policyVersion",
-                  "thresholds",
-                  "context",
-                  "signature"
-                ],
-                "properties": {
-                  "controlLoopSchemaType": {
-                    "type": "string",
-                    "description": "Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",
-                    "enum": [
-                      "VM",
-                      "VNF"
-                    ]
-                  },
-                  "eventName": {
-                    "type": "string",
-                    "description": "Event name to which thresholds need to be applied"
-                  },
-                  "policyName": {
-                    "type": "string",
-                    "description": "TCA Policy Scope Name"
-                  },
-                  "policyScope": {
-                    "type": "string",
-                    "description": "TCA Policy Scope"
-                  },
-                  "policyVersion": {
-                    "type": "string",
-                    "description": "TCA Policy Scope Version"
-                  },
-                  "thresholds": {
-                    "type": "array",
-                    "description": "Thresholds associated with eventName",
-                    "items": {
-                      "title": "onap.datatypes.monitoring.thresholds",
-                      "type": "object",
-                      "required": [
-                        "closedLoopControlName",
-                        "closedLoopEventStatus",
-                        "direction",
-                        "fieldPath",
-                        "severity",
-                        "thresholdValue",
-                        "version"
-                      ],
-                      "properties": {
-                        "closedLoopControlName": {
-                          "type": "string",
-                          "description": "Closed Loop Control Name associated with the threshold"
-                        },
-                        "closedLoopEventStatus": {
-                          "type": "string",
-                          "description": "Closed Loop Event Status of the threshold",
-                          "enum": [
-                            "ONSET",
-                            "ABATED"
-                          ]
-                        },
-                        "direction": {
-                          "type": "string",
-                          "description": "Direction of the threshold",
-                          "enum": [
-                            "LESS",
-                            "LESS_OR_EQUAL",
-                            "GREATER",
-                            "GREATER_OR_EQUAL",
-                            "EQUAL"
-                          ]
-                        },
-                        "fieldPath": {
-                          "type": "string",
-                          "description": "Json field Path as per CEF message which needs to be analyzed for TCA",
-                          "enum": [
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle",
-                            "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt",
-                            "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice",
-                            "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq",
-                            "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal",
-                            "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem",
-                            "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait",
-                            "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage",
-                            "$.event.measurementsForVfScalingFields.meanRequestLatency",
-                            "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered",
-                            "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached",
-                            "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured",
-                            "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree",
-                            "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed",
-                            "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
-                          ]
-                        },
-                        "severity": {
-                          "type": "string",
-                          "description": "Threshold Event Severity",
-                          "enum": [
-                            "CRITICAL",
-                            "MAJOR",
-                            "MINOR",
-                            "WARNING",
-                            "NORMAL"
-                          ]
-                        },
-                        "thresholdValue": {
-                          "type": "integer",
-                          "description": "Threshold value for the field Path inside CEF message"
-                        },
-                        "version": {
-                          "type": "string",
-                          "description": "Version number associated with the threshold"
-                        }
-                      }
-                    },
-                    "format": "tabs-top"
-                  },
-                  "context": {
-                    "type": "string",
-                    "description": "TCA Policy Dummy Context",
-                    "enum": [
-                      "PROD"
-                    ],
-                    "options": {
-                      "enum_titles": [
-                        "PROD"
-                      ]
-                    }
-                  },
-                  "signature": {
-                    "title": "onap.datatypes.monitoring.Dummy_Signature",
-                    "type": "object",
-                    "required": [
-                      "filter_clause"
-                    ],
-                    "properties": {
-                      "filter_clause": {
-                        "type": "qbldr",
-                        "description": "Filter Clause",
-                        "minLength": 1,
-                        "qschema": {
-                          "filters": [
-                            {
-                              "type": "string",
-                              "minLength": 1,
-                              "id": "alarmCondition",
-                              "label": "alarmCondition",
-                              "operators": [
-                                "equals"
-                              ]
-                            }
-                          ]
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              "format": "tabs-top"
-            }
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json b/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json
deleted file mode 100644
index 4519d5c9f..000000000
--- a/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json
+++ /dev/null
@@ -1,577 +0,0 @@
-{
-  "title": "onap.policies.controlloop.operational.common.Apex",
-  "type": "object",
-  "description": "Operational policies for Apex PDP",
-  "required": [
-    "abatement",
-    "operations",
-    "trigger",
-    "timeout",
-    "id",
-    "engineServiceParameters",
-    "eventOutputParameters",
-    "eventInputParameters"
-  ],
-  "properties": {
-    "abatement": {
-      "type": "boolean",
-      "description": "Whether an abatement event message will be expected for the control loop from DCAE.",
-      "default": "false"
-    },
-    "operations": {
-      "type": "array",
-      "description": "List of operations to be performed when Control Loop is triggered.",
-      "items": {
-        "title": "onap.datatype.controlloop.Operation",
-        "type": "object",
-        "description": "An operation supported by an actor",
-        "required": [
-          "id",
-          "operation",
-          "retries",
-          "timeout"
-        ],
-        "properties": {
-          "failure_retries": {
-            "type": "string",
-            "description": "Points to the operation to invoke when the current operation has exceeded its max retries.",
-            "default": "final_failure_retries"
-          },
-          "id": {
-            "type": "string",
-            "description": "Unique identifier for the operation"
-          },
-          "failure_timeout": {
-            "type": "string",
-            "description": "Points to the operation to invoke when the time out for the operation occurs.",
-            "default": "final_failure_timeout"
-          },
-          "failure": {
-            "type": "string",
-            "description": "Points to the operation to invoke on Actor operation failure.",
-            "default": "final_failure"
-          },
-          "operation": {
-            "title": "onap.datatype.controlloop.Actor",
-            "type": "object",
-            "description": "An actor/operation/target definition",
-            "required": [
-              "target",
-              "actor",
-              "operation"
-            ],
-            "properties": {
-              "payload": {
-                "type": "object",
-                "description": "Name/value pairs of payload information passed by Policy to the actor",
-                "anyOf": [
-                  {
-                    "title": "User defined",
-                    "properties": {}
-                  },
-                  {
-                    "title": "resource-assignment",
-                    "properties": {
-                      "artifact_name": {
-                        "title": "artifact name",
-                        "type": "string",
-                        "default": "baseconfiguration",
-                        "readOnly": true
-                      },
-                      "artifact_version": {
-                        "title": "artifact version",
-                        "type": "string",
-                        "default": "1.0.0",
-                        "readOnly": true
-                      },
-                      "mode": {
-                        "title": "mode",
-                        "type": "string",
-                        "default": "async",
-                        "readOnly": false
-                      },
-                      "data": {
-                        "title": "data",
-                        "type": "string",
-                        "format": "textarea",
-                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
-                      }
-                    }
-                  },
-                  {
-                    "title": "activate",
-                    "properties": {
-                      "artifact_name": {
-                        "title": "artifact name",
-                        "type": "string",
-                        "default": "baseconfiguration",
-                        "readOnly": true
-                      },
-                      "artifact_version": {
-                        "title": "artifact version",
-                        "type": "string",
-                        "default": "1.0.0",
-                        "readOnly": true
-                      },
-                      "mode": {
-                        "title": "mode",
-                        "type": "string",
-                        "default": "async",
-                        "readOnly": false
-                      },
-                      "data": {
-                        "title": "data",
-                        "type": "string",
-                        "format": "textarea",
-                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
-                      }
-                    }
-                  },
-                  {
-                    "title": "activate-restconf",
-                    "properties": {
-                      "artifact_name": {
-                        "title": "artifact name",
-                        "type": "string",
-                        "default": "baseconfiguration",
-                        "readOnly": true
-                      },
-                      "artifact_version": {
-                        "title": "artifact version",
-                        "type": "string",
-                        "default": "1.0.0",
-                        "readOnly": true
-                      },
-                      "mode": {
-                        "title": "mode",
-                        "type": "string",
-                        "default": "async",
-                        "readOnly": false
-                      },
-                      "data": {
-                        "title": "data",
-                        "type": "string",
-                        "format": "textarea",
-                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
-                      }
-                    }
-                  },
-                  {
-                    "title": "activate-cli",
-                    "properties": {
-                      "artifact_name": {
-                        "title": "artifact name",
-                        "type": "string",
-                        "default": "baseconfiguration",
-                        "readOnly": true
-                      },
-                      "artifact_version": {
-                        "title": "artifact version",
-                        "type": "string",
-                        "default": "1.0.0",
-                        "readOnly": true
-                      },
-                      "mode": {
-                        "title": "mode",
-                        "type": "string",
-                        "default": "async",
-                        "readOnly": false
-                      },
-                      "data": {
-                        "title": "data",
-                        "type": "string",
-                        "format": "textarea",
-                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
-                      }
-                    }
-                  },
-                  {
-                    "title": "assign-activate",
-                    "properties": {
-                      "artifact_name": {
-                        "title": "artifact name",
-                        "type": "string",
-                        "default": "baseconfiguration",
-                        "readOnly": true
-                      },
-                      "artifact_version": {
-                        "title": "artifact version",
-                        "type": "string",
-                        "default": "1.0.0",
-                        "readOnly": true
-                      },
-                      "mode": {
-                        "title": "mode",
-                        "type": "string",
-                        "default": "async",
-                        "readOnly": false
-                      },
-                      "data": {
-                        "title": "data",
-                        "type": "string",
-                        "format": "textarea",
-                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
-                      }
-                    }
-                  },
-                  {
-                    "title": "imperative-test-wf",
-                    "properties": {
-                      "artifact_name": {
-                        "title": "artifact name",
-                        "type": "string",
-                        "default": "baseconfiguration",
-                        "readOnly": true
-                      },
-                      "artifact_version": {
-                        "title": "artifact version",
-                        "type": "string",
-                        "default": "1.0.0",
-                        "readOnly": true
-                      },
-                      "mode": {
-                        "title": "mode",
-                        "type": "string",
-                        "default": "async",
-                        "readOnly": false
-                      },
-                      "data": {
-                        "title": "data",
-                        "type": "string",
-                        "format": "textarea",
-                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
-                      }
-                    }
-                  }
-                ]
-              },
-              "target": {
-                "title": "onap.datatype.controlloop.Target",
-                "type": "object",
-                "description": "Definition for a entity in A&AI to perform a control loop operation on",
-                "required": [
-                  "targetType"
-                ],
-                "properties": {
-                  "entityIds": {
-                    "type": "object",
-                    "description": "Map of values that identify the resource. If none are provided, it is assumed that the\nentity that generated the ONSET event will be the target.\n",
-                    "anyOf": [
-                      {
-                        "title": "User defined",
-                        "properties": {}
-                      },
-                      {
-                        "title": "VNF-vLoadBalancerMS 0",
-                        "properties": {
-                          "resourceID": {
-                            "title": "Resource ID",
-                            "type": "string",
-                            "default": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
-                            "readOnly": "True"
-                          }
-                        }
-                      },
-                      {
-                        "title": "VFMODULE-Vloadbalancerms..vpkg..module-1",
-                        "properties": {
-                          "resourceID": {
-                            "title": "Resource ID",
-                            "type": "string",
-                            "default": "Vloadbalancerms..vpkg..module-1",
-                            "readOnly": "True"
-                          },
-                          "modelInvariantId": {
-                            "title": "Model Invariant Id (ModelInvariantUUID)",
-                            "type": "string",
-                            "default": "ca052563-eb92-4b5b-ad41-9111768ce043",
-                            "readOnly": "True"
-                          },
-                          "modelVersionId": {
-                            "title": "Model Version Id (ModelUUID)",
-                            "type": "string",
-                            "default": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-                            "readOnly": "True"
-                          },
-                          "modelName": {
-                            "title": "Model Name",
-                            "type": "string",
-                            "default": "Vloadbalancerms..vpkg..module-1",
-                            "readOnly": "True"
-                          },
-                          "modelVersion": {
-                            "title": "Model Version",
-                            "type": "string",
-                            "default": "1",
-                            "readOnly": "True"
-                          },
-                          "modelCustomizationId": {
-                            "title": "Customization ID",
-                            "type": "string",
-                            "default": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
-                            "readOnly": "True"
-                          }
-                        }
-                      },
-                      {
-                        "title": "VFMODULE-Vloadbalancerms..vdns..module-3",
-                        "properties": {
-                          "resourceID": {
-                            "title": "Resource ID",
-                            "type": "string",
-                            "default": "Vloadbalancerms..vdns..module-3",
-                            "readOnly": "True"
-                          },
-                          "modelInvariantId": {
-                            "title": "Model Invariant Id (ModelInvariantUUID)",
-                            "type": "string",
-                            "default": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
-                            "readOnly": "True"
-                          },
-                          "modelVersionId": {
-                            "title": "Model Version Id (ModelUUID)",
-                            "type": "string",
-                            "default": "4fa73b49-8a6c-493e-816b-eb401567b720",
-                            "readOnly": "True"
-                          },
-                          "modelName": {
-                            "title": "Model Name",
-                            "type": "string",
-                            "default": "Vloadbalancerms..vdns..module-3",
-                            "readOnly": "True"
-                          },
-                          "modelVersion": {
-                            "title": "Model Version",
-                            "type": "string",
-                            "default": "1",
-                            "readOnly": "True"
-                          },
-                          "modelCustomizationId": {
-                            "title": "Customization ID",
-                            "type": "string",
-                            "default": "bafcdab0-801d-4d81-9ead-f464640a38b1",
-                            "readOnly": "True"
-                          }
-                        }
-                      },
-                      {
-                        "title": "VFMODULE-Vloadbalancerms..base_template..module-0",
-                        "properties": {
-                          "resourceID": {
-                            "title": "Resource ID",
-                            "type": "string",
-                            "default": "Vloadbalancerms..base_template..module-0",
-                            "readOnly": "True"
-                          },
-                          "modelInvariantId": {
-                            "title": "Model Invariant Id (ModelInvariantUUID)",
-                            "type": "string",
-                            "default": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
-                            "readOnly": "True"
-                          },
-                          "modelVersionId": {
-                            "title": "Model Version Id (ModelUUID)",
-                            "type": "string",
-                            "default": "63734409-f745-4e4d-a38b-131638a0edce",
-                            "readOnly": "True"
-                          },
-                          "modelName": {
-                            "title": "Model Name",
-                            "type": "string",
-                            "default": "Vloadbalancerms..base_template..module-0",
-                            "readOnly": "True"
-                          },
-                          "modelVersion": {
-                            "title": "Model Version",
-                            "type": "string",
-                            "default": "1",
-                            "readOnly": "True"
-                          },
-                          "modelCustomizationId": {
-                            "title": "Customization ID",
-                            "type": "string",
-                            "default": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
-                            "readOnly": "True"
-                          }
-                        }
-                      },
-                      {
-                        "title": "VFMODULE-Vloadbalancerms..vlb..module-2",
-                        "properties": {
-                          "resourceID": {
-                            "title": "Resource ID",
-                            "type": "string",
-                            "default": "Vloadbalancerms..vlb..module-2",
-                            "readOnly": "True"
-                          },
-                          "modelInvariantId": {
-                            "title": "Model Invariant Id (ModelInvariantUUID)",
-                            "type": "string",
-                            "default": "a772a1f4-0064-412c-833d-4749b15828dd",
-                            "readOnly": "True"
-                          },
-                          "modelVersionId": {
-                            "title": "Model Version Id (ModelUUID)",
-                            "type": "string",
-                            "default": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
-                            "readOnly": "True"
-                          },
-                          "modelName": {
-                            "title": "Model Name",
-                            "type": "string",
-                            "default": "Vloadbalancerms..vlb..module-2",
-                            "readOnly": "True"
-                          },
-                          "modelVersion": {
-                            "title": "Model Version",
-                            "type": "string",
-                            "default": "1",
-                            "readOnly": "True"
-                          },
-                          "modelCustomizationId": {
-                            "title": "Customization ID",
-                            "type": "string",
-                            "default": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
-                            "readOnly": "True"
-                          }
-                        }
-                      }
-                    ]
-                  },
-                  "targetType": {
-                    "type": "string",
-                    "description": "Category for the target type",
-                    "enum": [
-                      "VNF",
-                      "VM",
-                      "VFMODULE",
-                      "PNF"
-                    ]
-                  }
-                }
-              },
-              "actor": {
-                "type": "string",
-                "description": "The actor performing the operation.",
-                "enum": [
-                  "SDNR",
-                  "SDNC",
-                  "VFC",
-                  "SO",
-                  "APPC",
-                  "CDS"
-                ],
-                "options": {
-                  "enum_titles": [
-                    "SDNR",
-                    "SDNC",
-                    "VFC",
-                    "SO",
-                    "APPC"
-                  ]
-                }
-              },
-              "operation": {
-                "type": "string",
-                "description": "The operation the actor is performing.",
-                "enum": [
-                  "BandwidthOnDemand",
-                  "VF Module Delete",
-                  "Reroute",
-                  "VF Module Create",
-                  "ModifyConfig",
-                  "Rebuild",
-                  "Restart",
-                  "Migrate",
-                  "Health-Check",
-                  "resource-assignment",
-                  "activate",
-                  "activate-restconf",
-                  "activate-cli",
-                  "assign-activate",
-                  "imperative-test-wf"
-                ],
-                "options": {
-                  "enum_titles": [
-                    "BandwidthOnDemand (SDNC operation)",
-                    "VF Module Delete (SO operation)",
-                    "Reroute (SDNC operation)",
-                    "VF Module Create (SO operation)",
-                    "ModifyConfig (APPC/VFC operation)",
-                    "Rebuild (APPC operation)",
-                    "Restart (APPC operation)",
-                    "Migrate (APPC operation)",
-                    "Health-Check (APPC operation)",
-                    "resource-assignment (CDS operation)",
-                    "activate (CDS operation)",
-                    "activate-restconf (CDS operation)",
-                    "activate-cli (CDS operation)",
-                    "assign-activate (CDS operation)",
-                    "imperative-test-wf (CDS operation)"
-                  ]
-                }
-              }
-            }
-          },
-          "failure_guard": {
-            "type": "string",
-            "description": "Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.",
-            "default": "final_failure_guard"
-          },
-          "retries": {
-            "type": "integer",
-            "description": "The number of retries the actor should attempt to perform the operation.",
-            "default": "0"
-          },
-          "timeout": {
-            "type": "integer",
-            "description": "The amount of time for the actor to perform the operation."
-          },
-          "failure_exception": {
-            "type": "string",
-            "description": "Points to the operation to invoke when the current operation causes an exception.",
-            "default": "final_failure_exception"
-          },
-          "description": {
-            "type": "string",
-            "description": "A user-friendly description of the intent for the operation"
-          },
-          "success": {
-            "type": "string",
-            "description": "Points to the operation to invoke on success. A value of \"final_success\" indicates and end to the operation.",
-            "default": "final_success"
-          }
-        }
-      },
-      "format": "tabs-top"
-    },
-    "trigger": {
-      "type": "string",
-      "description": "Initial operation to execute upon receiving an Onset event message for the Control Loop."
-    },
-    "timeout": {
-      "type": "integer",
-      "description": "Overall timeout for executing all the operations. This timeout should equal or exceed the total\ntimeout for each operation listed.\n"
-    },
-    "id": {
-      "type": "string",
-      "description": "The unique control loop id."
-    },
-    "engineServiceParameters": {
-      "type": "string",
-      "description": "The engine parameters like name, instanceCount, policy implementation, parameters etc."
-    },
-    "eventOutputParameters": {
-      "type": "string",
-      "description": "The event output parameters."
-    },
-    "javaProperties": {
-      "type": "string",
-      "description": "Name/value pairs of properties to be set for APEX if needed."
-    },
-    "eventInputParameters": {
-      "type": "string",
-      "description": "The event input parameters."
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/new-converter/tosca_metadata_clamp_possible_values.yaml b/src/test/resources/tosca/new-converter/tosca_metadata_clamp_possible_values.yaml
deleted file mode 100644
index 7fe9d5398..000000000
--- a/src/test/resources/tosca/new-converter/tosca_metadata_clamp_possible_values.yaml
+++ /dev/null
@@ -1,184 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-    onap.policies.Monitoring:
-        derived_from: tosca.policies.Root
-        description: a base policy type for all policies that governs monitoring provisioning
-    onap.policies.monitoring.cdap.tca.hi.lo.app:
-        derived_from: onap.policies.Monitoring
-        version: 1.0.0
-        properties:
-            tca_policy:
-                type: map
-                description: TCA Policy JSON
-                entry_schema:
-                    type: onap.datatypes.monitoring.tca_policy
-        metadata:
-            policy_model_type: onap.policies.monitoring.cdap.tca.hi.lo.app
-            acronym: tca
-            
-data_types:
-    onap.datatypes.monitoring.metricsPerEventName:
-        derived_from: tosca.datatypes.Root
-        properties:
-            controlLoopSchemaType:
-                type: string
-                required: true
-                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM
-                constraints:
-                  - valid_values:
-                      - VM
-                      - VNF
-            eventName:
-                type: string
-                required: true
-                description: Event name to which thresholds need to be applied
-            policyName:
-                type: string
-                required: true
-                description: TCA Policy Scope Name
-            policyScope:
-                type: string
-                required: true
-                description: TCA Policy Scope
-            policyVersion:
-                type: string
-                required: true
-                description: TCA Policy Scope Version
-            thresholds:
-                type: list
-                required: true
-                description: Thresholds associated with eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.thresholds
-            context:
-                type: string
-                required: true
-                description: TCA Policy Dummy Context
-                metadata:
-                    clamp_possible_values: Dictionary:Context
-
-            signature:
-                type: onap.datatypes.monitoring.Dummy_Signature
-                description: Signature
-                required: true
-        
-    onap.datatypes.monitoring.Dummy_Signature:
-        derived_from: tosca.datatypes.Root
-        properties:
-            filter_clause:
-                type: string
-                description: Filter Clause
-                required: true
-                metadata:
-                    clamp_possible_values: Dictionary:EventDictionary#Operators
-            
-    onap.datatypes.monitoring.tca_policy:
-        derived_from: tosca.datatypes.Root
-        properties:
-            domain:
-                type: string
-                required: true
-                description: Domain name to which TCA needs to be applied
-                default: measurementsForVfScaling
-                constraints:
-                  - equal: measurementsForVfScaling
-            metricsPerEventName:
-                type: list
-                required: true
-                description: Contains eventName and threshold details that need to be applied to given eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.metricsPerEventName
-    onap.datatypes.monitoring.thresholds:
-        derived_from: tosca.datatypes.Root
-        properties:
-            closedLoopControlName:
-                type: string
-                required: true
-                description: Closed Loop Control Name associated with the threshold
-            closedLoopEventStatus:
-                type: string
-                required: true
-                description: Closed Loop Event Status of the threshold
-                constraints:
-                  - valid_values:
-                      - ONSET
-                      - ABATED
-            direction:
-                type: string
-                required: true
-                description: Direction of the threshold
-                constraints:
-                  - valid_values:
-                      - LESS
-                      - LESS_OR_EQUAL
-                      - GREATER
-                      - GREATER_OR_EQUAL
-                      - EQUAL
-            fieldPath:
-                type: string
-                required: true
-                description: Json field Path as per CEF message which needs to be analyzed for TCA
-                constraints:
-                  - valid_values:
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage
-                      - $.event.measurementsForVfScalingFields.meanRequestLatency
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed
-                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value
-            severity:
-                type: string
-                required: true
-                description: Threshold Event Severity
-                constraints:
-                  - valid_values:
-                      - CRITICAL
-                      - MAJOR
-                      - MINOR
-                      - WARNING
-                      - NORMAL
-            thresholdValue:
-                type: integer
-                required: true
-                description: Threshold value for the field Path inside CEF message
-            version:
-                type: string
-                required: true
-                description: Version number associated with the threshold
diff --git a/src/test/resources/tosca/operational-policy-cds-payload-with-list.json b/src/test/resources/tosca/operational-policy-cds-payload-with-list.json
deleted file mode 100644
index 9a9308e3b..000000000
--- a/src/test/resources/tosca/operational-policy-cds-payload-with-list.json
+++ /dev/null
@@ -1,590 +0,0 @@
-{
-  "type": "object",
-  "title": "Configuration",
-  "required": [
-    "operational_policy"
-  ],
-  "properties": {
-    "operational_policy": {
-      "type": "object",
-      "title": "Related Parameters",
-      "required": [
-        "controlLoop",
-        "policies"
-      ],
-      "properties": {
-        "controlLoop": {
-          "type": "object",
-          "title": "Control Loop details",
-          "required": [
-            "timeout",
-            "abatement",
-            "trigger_policy",
-            "controlLoopName"
-          ],
-          "properties": {
-            "timeout": {
-              "type": "string",
-              "title": "Overall Time Limit",
-              "default": "0",
-              "format": "number"
-            },
-            "abatement": {
-              "type": "string",
-              "title": "Abatement",
-              "enum": [
-                "True",
-                "False"
-              ]
-            },
-            "trigger_policy": {
-              "type": "string",
-              "title": "Policy Decision Entry"
-            },
-            "controlLoopName": {
-              "type": "string",
-              "title": "Control loop name",
-              "readOnly": "True"
-            }
-          }
-        },
-        "policies": {
-          "uniqueItems": "true",
-          "id": "policies_array",
-          "type": "array",
-          "title": "Policy Decision Tree",
-          "format": "tabs-top",
-          "items": {
-            "title": "Policy Decision",
-            "type": "object",
-            "id": "policy_item",
-            "headerTemplate": "{{self.id}} - {{self.recipe}}",
-            "format": "categories",
-            "basicCategoryTitle": "recipe",
-            "required": [
-              "id",
-              "retry",
-              "timeout",
-              "actor",
-              "success",
-              "failure",
-              "failure_timeout",
-              "failure_retries",
-              "failure_exception",
-              "failure_guard",
-              "target"
-            ],
-            "properties": {
-              "id": {
-                "default": "Policy 1",
-                "title": "Policy ID",
-                "type": "string"
-              },
-              "retry": {
-                "default": "0",
-                "title": "Number of Retry",
-                "type": "string",
-                "format": "number"
-              },
-              "timeout": {
-                "default": "0",
-                "title": "Timeout",
-                "type": "string",
-                "format": "number"
-              },
-              "actor": {
-                "type": "object",
-                "title": "Actor",
-                "anyOf": [
-                  {
-                    "title": "APPC",
-                    "type": "object",
-                    "properties": {
-                      "actor": {
-                        "title": "actor",
-                        "type": "string",
-                        "default": "APPC",
-                        "options": {
-                          "hidden": true
-                        }
-                      },
-                      "recipe": {
-                        "title": "recipe",
-                        "type": "string",
-                        "default": "",
-                        "enum": [
-                          "Restart",
-                          "Rebuild",
-                          "Migrate",
-                          "Health-Check",
-                          "ModifyConfig"
-                        ]
-                      },
-                      "payload": {
-                        "title": "Payload (YAML)",
-                        "type": "string",
-                        "format": "textarea"
-                      }
-                    }
-                  },
-                  {
-                    "title": "SO",
-                    "type": "object",
-                    "properties": {
-                      "actor": {
-                        "title": "actor",
-                        "type": "string",
-                        "default": "SO",
-                        "options": {
-                          "hidden": true
-                        }
-                      },
-                      "recipe": {
-                        "title": "recipe",
-                        "type": "string",
-                        "default": "",
-                        "enum": [
-                          "VF Module Create",
-                          "VF Module Delete"
-                        ]
-                      },
-                      "payload": {
-                        "title": "Payload (YAML)",
-                        "type": "string",
-                        "format": "textarea"
-                      }
-                    }
-                  },
-                  {
-                    "title": "SDNC",
-                    "type": "object",
-                    "properties": {
-                      "actor": {
-                        "title": "actor",
-                        "type": "string",
-                        "default": "SDNC",
-                        "options": {
-                          "hidden": true
-                        }
-                      },
-                      "recipe": {
-                        "title": "recipe",
-                        "type": "string",
-                        "default": "",
-                        "enum": [
-                          "Reroute",
-                          "BandwidthOnDemand"
-                        ]
-                      },
-                      "payload": {
-                        "title": "Payload (YAML)",
-                        "type": "string",
-                        "format": "textarea"
-                      }
-                    }
-                  },
-                  {
-                    "title": "VFC",
-                    "type": "object",
-                    "properties": {
-                      "actor": {
-                        "title": "actor",
-                        "type": "string",
-                        "default": "VFC",
-                        "options": {
-                          "hidden": true
-                        }
-                      },
-                      "recipe": {
-                        "title": "recipe",
-                        "type": "string",
-                        "default": "",
-                        "enum": [
-                          "ModifyConfig"
-                        ]
-                      },
-                      "payload": {
-                        "title": "Payload (YAML)",
-                        "type": "string",
-                        "format": "textarea"
-                      }
-                    }
-                  },
-                  {
-                    "title": "CDS",
-                    "type": "object",
-                    "properties": {
-                      "actor": {
-                        "title": "actor",
-                        "type": "string",
-                        "default": "CDS",
-                        "options": {
-                          "hidden": true
-                        }
-                      },
-                      "recipe": {
-                        "title": "recipe",
-                        "type": "object",
-                        "anyOf": [
-                          {
-                            "title": "user-defined",
-                            "type": "object",
-                            "properties": {
-                              "recipe": {
-                                "title": "recipe",
-                                "type": "string",
-                                "default": "user-defined",
-                                "format": "textarea"
-                              },
-                              "payload": {
-                                "title": "Payload (YAML)",
-                                "type": "string",
-                                "default": "",
-                                "format": "textarea"
-                              }
-                            }
-                          },
-                          {
-                            "title": "resource-assignment",
-                            "type": "object",
-                            "properties": {
-                              "recipe": {
-                                "title": "recipe",
-                                "type": "string",
-                                "default": "resource-assignment",
-                                "options": {
-                                  "hidden": true
-                                }
-                              },
-                              "payload": {
-                                "title": "Payload",
-                                "type": "object",
-                                "properties": {
-                                  "artifact_name": {
-                                    "title": "artifact name",
-                                    "type": "string",
-                                    "default": "baseconfiguration",
-                                    "readOnly": "True"
-                                  },
-                                  "artifact_version": {
-                                    "title": "artifact version",
-                                    "type": "string",
-                                    "default": "1.0.0",
-                                    "readOnly": "True"
-                                  },
-                                  "mode": {
-                                    "title": "mode",
-                                    "type": "string",
-                                    "default": "async"
-                                  },
-                                  "data": {
-                                    "title": "data",
-                                    "properties": {
-                                      "template-prefix": {
-                                        "title": "template-prefix",
-                                        "type": "array"
-                                      },
-                                      "template-prefix-with-complex-type": {
-                                        "title": "template-prefix-with-complex-type",
-                                        "type": "array",
-                                        "items": {
-                                          "properties": {
-                                            "prefix-id": {
-                                              "title": "prefix-id",
-                                              "type": "string"
-                                            }
-                                          }
-                                        }
-                                      },
-                                      "private1-prefix-id": {
-                                        "title": "private1-prefix-id",
-                                        "type": "string"
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        ]
-                      }
-                    }
-                  }
-                ]
-              },
-              "success": {
-                "default": "final_success",
-                "title": "When Success",
-                "type": "string"
-              },
-              "failure": {
-                "default": "final_failure",
-                "title": "When Failure",
-                "type": "string"
-              },
-              "failure_timeout": {
-                "default": "final_failure_timeout",
-                "title": "When Failure Timeout",
-                "type": "string"
-              },
-              "failure_retries": {
-                "default": "final_failure_retries",
-                "title": "When Failure Retries",
-                "type": "string"
-              },
-              "failure_exception": {
-                "default": "final_failure_exception",
-                "title": "When Failure Exception",
-                "type": "string"
-              },
-              "failure_guard": {
-                "default": "final_failure_guard",
-                "title": "When Failure Guard",
-                "type": "string"
-              },
-              "target": {
-                "type": "object",
-                "required": [
-                  "type",
-                  "resourceID"
-                ],
-                "anyOf": [
-                  {
-                    "title": "User Defined",
-                    "additionalProperties": "True",
-                    "properties": {
-                      "type": {
-                        "title": "Target type",
-                        "type": "string",
-                        "default": "",
-                        "enum": [
-                          "VNF",
-                          "VFMODULE",
-                          "VM"
-                        ]
-                      },
-                      "resourceID": {
-                        "title": "Target type",
-                        "type": "string",
-                        "default": ""
-                      }
-                    }
-                  },
-                  {
-                    "title": "User defined",
-                    "properties": {}
-                  },
-                  {
-                    "title": "VNF-vLoadBalancerMS 0",
-                    "properties": {
-                      "type": {
-                        "title": "Type",
-                        "type": "string",
-                        "default": "VNF",
-                        "readOnly": "True"
-                      },
-                      "resourceID": {
-                        "title": "Resource ID",
-                        "type": "string",
-                        "default": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
-                        "readOnly": "True"
-                      }
-                    }
-                  },
-                  {
-                    "title": "VFMODULE-Vloadbalancerms..vpkg..module-1",
-                    "properties": {
-                      "type": {
-                        "title": "Type",
-                        "type": "string",
-                        "default": "VFMODULE",
-                        "readOnly": "True"
-                      },
-                      "resourceID": {
-                        "title": "Resource ID",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vpkg..module-1",
-                        "readOnly": "True"
-                      },
-                      "modelInvariantId": {
-                        "title": "Model Invariant Id (ModelInvariantUUID)",
-                        "type": "string",
-                        "default": "ca052563-eb92-4b5b-ad41-9111768ce043",
-                        "readOnly": "True"
-                      },
-                      "modelVersionId": {
-                        "title": "Model Version Id (ModelUUID)",
-                        "type": "string",
-                        "default": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-                        "readOnly": "True"
-                      },
-                      "modelName": {
-                        "title": "Model Name",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vpkg..module-1",
-                        "readOnly": "True"
-                      },
-                      "modelVersion": {
-                        "title": "Model Version",
-                        "type": "string",
-                        "default": "1",
-                        "readOnly": "True"
-                      },
-                      "modelCustomizationId": {
-                        "title": "Customization ID",
-                        "type": "string",
-                        "default": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
-                        "readOnly": "True"
-                      }
-                    }
-                  },
-                  {
-                    "title": "VFMODULE-Vloadbalancerms..vdns..module-3",
-                    "properties": {
-                      "type": {
-                        "title": "Type",
-                        "type": "string",
-                        "default": "VFMODULE",
-                        "readOnly": "True"
-                      },
-                      "resourceID": {
-                        "title": "Resource ID",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vdns..module-3",
-                        "readOnly": "True"
-                      },
-                      "modelInvariantId": {
-                        "title": "Model Invariant Id (ModelInvariantUUID)",
-                        "type": "string",
-                        "default": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
-                        "readOnly": "True"
-                      },
-                      "modelVersionId": {
-                        "title": "Model Version Id (ModelUUID)",
-                        "type": "string",
-                        "default": "4fa73b49-8a6c-493e-816b-eb401567b720",
-                        "readOnly": "True"
-                      },
-                      "modelName": {
-                        "title": "Model Name",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vdns..module-3",
-                        "readOnly": "True"
-                      },
-                      "modelVersion": {
-                        "title": "Model Version",
-                        "type": "string",
-                        "default": "1",
-                        "readOnly": "True"
-                      },
-                      "modelCustomizationId": {
-                        "title": "Customization ID",
-                        "type": "string",
-                        "default": "bafcdab0-801d-4d81-9ead-f464640a38b1",
-                        "readOnly": "True"
-                      }
-                    }
-                  },
-                  {
-                    "title": "VFMODULE-Vloadbalancerms..base_template..module-0",
-                    "properties": {
-                      "type": {
-                        "title": "Type",
-                        "type": "string",
-                        "default": "VFMODULE",
-                        "readOnly": "True"
-                      },
-                      "resourceID": {
-                        "title": "Resource ID",
-                        "type": "string",
-                        "default": "Vloadbalancerms..base_template..module-0",
-                        "readOnly": "True"
-                      },
-                      "modelInvariantId": {
-                        "title": "Model Invariant Id (ModelInvariantUUID)",
-                        "type": "string",
-                        "default": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
-                        "readOnly": "True"
-                      },
-                      "modelVersionId": {
-                        "title": "Model Version Id (ModelUUID)",
-                        "type": "string",
-                        "default": "63734409-f745-4e4d-a38b-131638a0edce",
-                        "readOnly": "True"
-                      },
-                      "modelName": {
-                        "title": "Model Name",
-                        "type": "string",
-                        "default": "Vloadbalancerms..base_template..module-0",
-                        "readOnly": "True"
-                      },
-                      "modelVersion": {
-                        "title": "Model Version",
-                        "type": "string",
-                        "default": "1",
-                        "readOnly": "True"
-                      },
-                      "modelCustomizationId": {
-                        "title": "Customization ID",
-                        "type": "string",
-                        "default": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
-                        "readOnly": "True"
-                      }
-                    }
-                  },
-                  {
-                    "title": "VFMODULE-Vloadbalancerms..vlb..module-2",
-                    "properties": {
-                      "type": {
-                        "title": "Type",
-                        "type": "string",
-                        "default": "VFMODULE",
-                        "readOnly": "True"
-                      },
-                      "resourceID": {
-                        "title": "Resource ID",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vlb..module-2",
-                        "readOnly": "True"
-                      },
-                      "modelInvariantId": {
-                        "title": "Model Invariant Id (ModelInvariantUUID)",
-                        "type": "string",
-                        "default": "a772a1f4-0064-412c-833d-4749b15828dd",
-                        "readOnly": "True"
-                      },
-                      "modelVersionId": {
-                        "title": "Model Version Id (ModelUUID)",
-                        "type": "string",
-                        "default": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
-                        "readOnly": "True"
-                      },
-                      "modelName": {
-                        "title": "Model Name",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vlb..module-2",
-                        "readOnly": "True"
-                      },
-                      "modelVersion": {
-                        "title": "Model Version",
-                        "type": "string",
-                        "default": "1",
-                        "readOnly": "True"
-                      },
-                      "modelCustomizationId": {
-                        "title": "Customization ID",
-                        "type": "string",
-                        "default": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
-                        "readOnly": "True"
-                      }
-                    }
-                  }
-                ]
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/operational-policy-json-schema.json b/src/test/resources/tosca/operational-policy-json-schema.json
deleted file mode 100644
index dc6c32fa7..000000000
--- a/src/test/resources/tosca/operational-policy-json-schema.json
+++ /dev/null
@@ -1,936 +0,0 @@
-{
-  "type": "object",
-  "title": "Configuration",
-  "required": [
-    "operational_policy"
-  ],
-  "properties": {
-    "operational_policy": {
-      "type": "object",
-      "title": "Related Parameters",
-      "required": [
-        "controlLoop",
-        "policies"
-      ],
-      "properties": {
-        "controlLoop": {
-          "type": "object",
-          "title": "Control Loop details",
-          "required": [
-            "timeout",
-            "abatement",
-            "trigger_policy",
-            "controlLoopName"
-          ],
-          "properties": {
-            "timeout": {
-              "type": "string",
-              "title": "Overall Time Limit",
-              "default": "0",
-              "format": "number"
-            },
-            "abatement": {
-              "type": "string",
-              "title": "Abatement",
-              "enum": [
-                "True",
-                "False"
-              ]
-            },
-            "trigger_policy": {
-              "type": "string",
-              "title": "Policy Decision Entry"
-            },
-            "controlLoopName": {
-              "type": "string",
-              "title": "Control loop name",
-              "readOnly": "True"
-            }
-          }
-        },
-        "policies": {
-          "uniqueItems": "true",
-          "id": "policies_array",
-          "type": "array",
-          "title": "Policy Decision Tree",
-          "format": "tabs-top",
-          "items": {
-            "title": "Policy Decision",
-            "type": "object",
-            "id": "policy_item",
-            "headerTemplate": "{{self.id}} - {{self.recipe}}",
-            "format": "categories",
-            "basicCategoryTitle": "recipe",
-            "required": [
-              "id",
-              "retry",
-              "timeout",
-              "actor",
-              "success",
-              "failure",
-              "failure_timeout",
-              "failure_retries",
-              "failure_exception",
-              "failure_guard",
-              "target"
-            ],
-            "properties": {
-              "id": {
-                "default": "Policy 1",
-                "title": "Policy ID",
-                "type": "string"
-              },
-              "retry": {
-                "default": "0",
-                "title": "Number of Retry",
-                "type": "string",
-                "format": "number"
-              },
-              "timeout": {
-                "default": "0",
-                "title": "Timeout",
-                "type": "string",
-                "format": "number"
-              },
-              "actor": {
-                "type": "object",
-                "title": "Actor",
-                "anyOf": [
-                  {
-                    "title": "APPC",
-                    "type": "object",
-                    "properties": {
-                      "actor": {
-                        "title": "actor",
-                        "type": "string",
-                        "default": "APPC",
-                        "options": {
-                          "hidden": true
-                        }
-                      },
-                      "recipe": {
-                        "title": "recipe",
-                        "type": "string",
-                        "default": "",
-                        "enum": [
-                          "Restart",
-                          "Rebuild",
-                          "Migrate",
-                          "Health-Check",
-                          "ModifyConfig"
-                        ]
-                      },
-                      "payload": {
-                        "title": "Payload (YAML)",
-                        "type": "string",
-                        "format": "textarea"
-                      }
-                    }
-                  },
-                  {
-                    "title": "SO",
-                    "type": "object",
-                    "properties": {
-                      "actor": {
-                        "title": "actor",
-                        "type": "string",
-                        "default": "SO",
-                        "options": {
-                          "hidden": true
-                        }
-                      },
-                      "recipe": {
-                        "title": "recipe",
-                        "type": "string",
-                        "default": "",
-                        "enum": [
-                          "VF Module Create",
-                          "VF Module Delete"
-                        ]
-                      },
-                      "payload": {
-                        "title": "Payload (YAML)",
-                        "type": "string",
-                        "format": "textarea"
-                      }
-                    }
-                  },
-                  {
-                    "title": "SDNC",
-                    "type": "object",
-                    "properties": {
-                      "actor": {
-                        "title": "actor",
-                        "type": "string",
-                        "default": "SDNC",
-                        "options": {
-                          "hidden": true
-                        }
-                      },
-                      "recipe": {
-                        "title": "recipe",
-                        "type": "string",
-                        "default": "",
-                        "enum": [
-                          "Reroute",
-                          "BandwidthOnDemand"
-                        ]
-                      },
-                      "payload": {
-                        "title": "Payload (YAML)",
-                        "type": "string",
-                        "format": "textarea"
-                      }
-                    }
-                  },
-                  {
-                    "title": "VFC",
-                    "type": "object",
-                    "properties": {
-                      "actor": {
-                        "title": "actor",
-                        "type": "string",
-                        "default": "VFC",
-                        "options": {
-                          "hidden": true
-                        }
-                      },
-                      "recipe": {
-                        "title": "recipe",
-                        "type": "string",
-                        "default": "",
-                        "enum": [
-                          "ModifyConfig"
-                        ]
-                      },
-                      "payload": {
-                        "title": "Payload (YAML)",
-                        "type": "string",
-                        "format": "textarea"
-                      }
-                    }
-                  },
-                  {
-                    "title": "CDS",
-                    "type": "object",
-                    "properties": {
-                      "actor": {
-                        "title": "actor",
-                        "type": "string",
-                        "default": "CDS",
-                        "options": {
-                          "hidden": true
-                        }
-                      },
-                      "recipe": {
-                        "title": "recipe",
-                        "type": "object",
-                        "anyOf": [
-                          {
-                            "title": "user-defined",
-                            "type": "object",
-                            "properties": {
-                              "recipe": {
-                                "title": "recipe",
-                                "type": "string",
-                                "default": "user-defined",
-                                "format": "textarea"
-                              },
-                              "payload": {
-                                "title": "Payload (YAML)",
-                                "type": "string",
-                                "default": "",
-                                "format": "textarea"
-                              }
-                            }
-                          },
-                          {
-                            "title": "resource-assignment",
-                            "type": "object",
-                            "properties": {
-                              "recipe": {
-                                "title": "recipe",
-                                "type": "string",
-                                "default": "resource-assignment",
-                                "options": {
-                                  "hidden": true
-                                }
-                              },
-                              "payload": {
-                                "title": "Payload",
-                                "type": "object",
-                                "properties": {
-                                  "artifact_name": {
-                                    "title": "artifact name",
-                                    "type": "string",
-                                    "default": "baseconfiguration",
-                                    "readOnly": "True"
-                                  },
-                                  "artifact_version": {
-                                    "title": "artifact version",
-                                    "type": "string",
-                                    "default": "1.0.0",
-                                    "readOnly": "True"
-                                  },
-                                  "mode": {
-                                    "title": "mode",
-                                    "type": "string",
-                                    "default": "async"
-                                  },
-                                  "data": {
-                                    "title": "data",
-                                    "properties": {
-                                      "request-id": {
-                                        "title": "request-id",
-                                        "type": "string"
-                                      },
-                                      "service-instance-id": {
-                                        "title": "service-instance-id",
-                                        "type": "string"
-                                      },
-                                      "hostname": {
-                                        "title": "hostname",
-                                        "type": "string"
-                                      },
-                                      "request-info": {
-                                        "title": "request-info",
-                                        "type": "object",
-                                        "properties": {
-                                          "prop1": {
-                                            "title": "prop1",
-                                            "type": "string"
-                                          },
-                                          "prop2": {
-                                            "title": "prop2",
-                                            "type": "string"
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          },
-                          {
-                            "title": "activate",
-                            "type": "object",
-                            "properties": {
-                              "recipe": {
-                                "title": "recipe",
-                                "type": "string",
-                                "default": "activate",
-                                "options": {
-                                  "hidden": true
-                                }
-                              },
-                              "payload": {
-                                "title": "Payload",
-                                "type": "object",
-                                "properties": {
-                                  "artifact_name": {
-                                    "title": "artifact name",
-                                    "type": "string",
-                                    "default": "baseconfiguration",
-                                    "readOnly": "True"
-                                  },
-                                  "artifact_version": {
-                                    "title": "artifact version",
-                                    "type": "string",
-                                    "default": "1.0.0",
-                                    "readOnly": "True"
-                                  },
-                                  "mode": {
-                                    "title": "mode",
-                                    "type": "string",
-                                    "default": "async"
-                                  },
-                                  "data": {
-                                    "title": "data",
-                                    "properties": {
-                                      "request-id": {
-                                        "title": "request-id",
-                                        "type": "string"
-                                      },
-                                      "service-instance-id": {
-                                        "title": "service-instance-id",
-                                        "type": "string"
-                                      },
-                                      "hostname": {
-                                        "title": "hostname",
-                                        "type": "string"
-                                      },
-                                      "request-info": {
-                                        "title": "request-info",
-                                        "type": "object",
-                                        "properties": {
-                                          "prop1": {
-                                            "title": "prop1",
-                                            "type": "string"
-                                          },
-                                          "prop2": {
-                                            "title": "prop2",
-                                            "type": "string"
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          },
-                          {
-                            "title": "activate-restconf",
-                            "type": "object",
-                            "properties": {
-                              "recipe": {
-                                "title": "recipe",
-                                "type": "string",
-                                "default": "activate-restconf",
-                                "options": {
-                                  "hidden": true
-                                }
-                              },
-                              "payload": {
-                                "title": "Payload",
-                                "type": "object",
-                                "properties": {
-                                  "artifact_name": {
-                                    "title": "artifact name",
-                                    "type": "string",
-                                    "default": "baseconfiguration",
-                                    "readOnly": "True"
-                                  },
-                                  "artifact_version": {
-                                    "title": "artifact version",
-                                    "type": "string",
-                                    "default": "1.0.0",
-                                    "readOnly": "True"
-                                  },
-                                  "mode": {
-                                    "title": "mode",
-                                    "type": "string",
-                                    "default": "async"
-                                  },
-                                  "data": {
-                                    "title": "data",
-                                    "properties": {
-                                      "request-id": {
-                                        "title": "request-id",
-                                        "type": "string"
-                                      },
-                                      "service-instance-id": {
-                                        "title": "service-instance-id",
-                                        "type": "string"
-                                      },
-                                      "hostname": {
-                                        "title": "hostname",
-                                        "type": "string"
-                                      },
-                                      "request-info": {
-                                        "title": "request-info",
-                                        "type": "object",
-                                        "properties": {
-                                          "prop1": {
-                                            "title": "prop1",
-                                            "type": "string"
-                                          },
-                                          "prop2": {
-                                            "title": "prop2",
-                                            "type": "string"
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          },
-                          {
-                            "title": "activate-cli",
-                            "type": "object",
-                            "properties": {
-                              "recipe": {
-                                "title": "recipe",
-                                "type": "string",
-                                "default": "activate-cli",
-                                "options": {
-                                  "hidden": true
-                                }
-                              },
-                              "payload": {
-                                "title": "Payload",
-                                "type": "object",
-                                "properties": {
-                                  "artifact_name": {
-                                    "title": "artifact name",
-                                    "type": "string",
-                                    "default": "baseconfiguration",
-                                    "readOnly": "True"
-                                  },
-                                  "artifact_version": {
-                                    "title": "artifact version",
-                                    "type": "string",
-                                    "default": "1.0.0",
-                                    "readOnly": "True"
-                                  },
-                                  "mode": {
-                                    "title": "mode",
-                                    "type": "string",
-                                    "default": "async"
-                                  },
-                                  "data": {
-                                    "title": "data",
-                                    "properties": {
-                                      "request-id": {
-                                        "title": "request-id",
-                                        "type": "string"
-                                      },
-                                      "service-instance-id": {
-                                        "title": "service-instance-id",
-                                        "type": "string"
-                                      },
-                                      "hostname": {
-                                        "title": "hostname",
-                                        "type": "string"
-                                      },
-                                      "request-info": {
-                                        "title": "request-info",
-                                        "type": "object",
-                                        "properties": {
-                                          "prop1": {
-                                            "title": "prop1",
-                                            "type": "string"
-                                          },
-                                          "prop2": {
-                                            "title": "prop2",
-                                            "type": "string"
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          },
-                          {
-                            "title": "assign-activate",
-                            "type": "object",
-                            "properties": {
-                              "recipe": {
-                                "title": "recipe",
-                                "type": "string",
-                                "default": "assign-activate",
-                                "options": {
-                                  "hidden": true
-                                }
-                              },
-                              "payload": {
-                                "title": "Payload",
-                                "type": "object",
-                                "properties": {
-                                  "artifact_name": {
-                                    "title": "artifact name",
-                                    "type": "string",
-                                    "default": "baseconfiguration",
-                                    "readOnly": "True"
-                                  },
-                                  "artifact_version": {
-                                    "title": "artifact version",
-                                    "type": "string",
-                                    "default": "1.0.0",
-                                    "readOnly": "True"
-                                  },
-                                  "mode": {
-                                    "title": "mode",
-                                    "type": "string",
-                                    "default": "async"
-                                  },
-                                  "data": {
-                                    "title": "data",
-                                    "properties": {
-                                      "request-id": {
-                                        "title": "request-id",
-                                        "type": "string"
-                                      },
-                                      "service-instance-id": {
-                                        "title": "service-instance-id",
-                                        "type": "string"
-                                      },
-                                      "hostname": {
-                                        "title": "hostname",
-                                        "type": "string"
-                                      },
-                                      "request-info": {
-                                        "title": "request-info",
-                                        "type": "object",
-                                        "properties": {
-                                          "prop1": {
-                                            "title": "prop1",
-                                            "type": "string"
-                                          },
-                                          "prop2": {
-                                            "title": "prop2",
-                                            "type": "string"
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          },
-                          {
-                            "title": "imperative-test-wf",
-                            "type": "object",
-                            "properties": {
-                              "recipe": {
-                                "title": "recipe",
-                                "type": "string",
-                                "default": "imperative-test-wf",
-                                "options": {
-                                  "hidden": true
-                                }
-                              },
-                              "payload": {
-                                "title": "Payload",
-                                "type": "object",
-                                "properties": {
-                                  "artifact_name": {
-                                    "title": "artifact name",
-                                    "type": "string",
-                                    "default": "baseconfiguration",
-                                    "readOnly": "True"
-                                  },
-                                  "artifact_version": {
-                                    "title": "artifact version",
-                                    "type": "string",
-                                    "default": "1.0.0",
-                                    "readOnly": "True"
-                                  },
-                                  "mode": {
-                                    "title": "mode",
-                                    "type": "string",
-                                    "default": "async"
-                                  },
-                                  "data": {
-                                    "title": "data",
-                                    "properties": {
-                                      "request-id": {
-                                        "title": "request-id",
-                                        "type": "string"
-                                      },
-                                      "service-instance-id": {
-                                        "title": "service-instance-id",
-                                        "type": "string"
-                                      },
-                                      "hostname": {
-                                        "title": "hostname",
-                                        "type": "string"
-                                      },
-                                      "request-info": {
-                                        "title": "request-info",
-                                        "type": "object",
-                                        "properties": {
-                                          "prop1": {
-                                            "title": "prop1",
-                                            "type": "string"
-                                          },
-                                          "prop2": {
-                                            "title": "prop2",
-                                            "type": "string"
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        ]
-                      }
-                    }
-                  }
-                ]
-              },
-              "success": {
-                "default": "final_success",
-                "title": "When Success",
-                "type": "string"
-              },
-              "failure": {
-                "default": "final_failure",
-                "title": "When Failure",
-                "type": "string"
-              },
-              "failure_timeout": {
-                "default": "final_failure_timeout",
-                "title": "When Failure Timeout",
-                "type": "string"
-              },
-              "failure_retries": {
-                "default": "final_failure_retries",
-                "title": "When Failure Retries",
-                "type": "string"
-              },
-              "failure_exception": {
-                "default": "final_failure_exception",
-                "title": "When Failure Exception",
-                "type": "string"
-              },
-              "failure_guard": {
-                "default": "final_failure_guard",
-                "title": "When Failure Guard",
-                "type": "string"
-              },
-              "target": {
-                "type": "object",
-                "required": [
-                  "type",
-                  "resourceID"
-                ],
-                "anyOf": [
-                  {
-                    "title": "User Defined",
-                    "additionalProperties": "True",
-                    "properties": {
-                      "type": {
-                        "title": "Target type",
-                        "type": "string",
-                        "default": "",
-                        "enum": [
-                          "VNF",
-                          "VFMODULE",
-                          "VM"
-                        ]
-                      },
-                      "resourceID": {
-                        "title": "Target type",
-                        "type": "string",
-                        "default": ""
-                      }
-                    }
-                  },
-                  {
-                    "title": "User defined",
-                    "properties": {}
-                  },
-                  {
-                    "title": "VNF-vLoadBalancerMS 0",
-                    "properties": {
-                      "type": {
-                        "title": "Type",
-                        "type": "string",
-                        "default": "VNF",
-                        "readOnly": "True"
-                      },
-                      "resourceID": {
-                        "title": "Resource ID",
-                        "type": "string",
-                        "default": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
-                        "readOnly": "True"
-                      }
-                    }
-                  },
-                  {
-                    "title": "VFMODULE-Vloadbalancerms..vpkg..module-1",
-                    "properties": {
-                      "type": {
-                        "title": "Type",
-                        "type": "string",
-                        "default": "VFMODULE",
-                        "readOnly": "True"
-                      },
-                      "resourceID": {
-                        "title": "Resource ID",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vpkg..module-1",
-                        "readOnly": "True"
-                      },
-                      "modelInvariantId": {
-                        "title": "Model Invariant Id (ModelInvariantUUID)",
-                        "type": "string",
-                        "default": "ca052563-eb92-4b5b-ad41-9111768ce043",
-                        "readOnly": "True"
-                      },
-                      "modelVersionId": {
-                        "title": "Model Version Id (ModelUUID)",
-                        "type": "string",
-                        "default": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-                        "readOnly": "True"
-                      },
-                      "modelName": {
-                        "title": "Model Name",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vpkg..module-1",
-                        "readOnly": "True"
-                      },
-                      "modelVersion": {
-                        "title": "Model Version",
-                        "type": "string",
-                        "default": "1",
-                        "readOnly": "True"
-                      },
-                      "modelCustomizationId": {
-                        "title": "Customization ID",
-                        "type": "string",
-                        "default": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
-                        "readOnly": "True"
-                      }
-                    }
-                  },
-                  {
-                    "title": "VFMODULE-Vloadbalancerms..vdns..module-3",
-                    "properties": {
-                      "type": {
-                        "title": "Type",
-                        "type": "string",
-                        "default": "VFMODULE",
-                        "readOnly": "True"
-                      },
-                      "resourceID": {
-                        "title": "Resource ID",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vdns..module-3",
-                        "readOnly": "True"
-                      },
-                      "modelInvariantId": {
-                        "title": "Model Invariant Id (ModelInvariantUUID)",
-                        "type": "string",
-                        "default": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
-                        "readOnly": "True"
-                      },
-                      "modelVersionId": {
-                        "title": "Model Version Id (ModelUUID)",
-                        "type": "string",
-                        "default": "4fa73b49-8a6c-493e-816b-eb401567b720",
-                        "readOnly": "True"
-                      },
-                      "modelName": {
-                        "title": "Model Name",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vdns..module-3",
-                        "readOnly": "True"
-                      },
-                      "modelVersion": {
-                        "title": "Model Version",
-                        "type": "string",
-                        "default": "1",
-                        "readOnly": "True"
-                      },
-                      "modelCustomizationId": {
-                        "title": "Customization ID",
-                        "type": "string",
-                        "default": "bafcdab0-801d-4d81-9ead-f464640a38b1",
-                        "readOnly": "True"
-                      }
-                    }
-                  },
-                  {
-                    "title": "VFMODULE-Vloadbalancerms..base_template..module-0",
-                    "properties": {
-                      "type": {
-                        "title": "Type",
-                        "type": "string",
-                        "default": "VFMODULE",
-                        "readOnly": "True"
-                      },
-                      "resourceID": {
-                        "title": "Resource ID",
-                        "type": "string",
-                        "default": "Vloadbalancerms..base_template..module-0",
-                        "readOnly": "True"
-                      },
-                      "modelInvariantId": {
-                        "title": "Model Invariant Id (ModelInvariantUUID)",
-                        "type": "string",
-                        "default": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
-                        "readOnly": "True"
-                      },
-                      "modelVersionId": {
-                        "title": "Model Version Id (ModelUUID)",
-                        "type": "string",
-                        "default": "63734409-f745-4e4d-a38b-131638a0edce",
-                        "readOnly": "True"
-                      },
-                      "modelName": {
-                        "title": "Model Name",
-                        "type": "string",
-                        "default": "Vloadbalancerms..base_template..module-0",
-                        "readOnly": "True"
-                      },
-                      "modelVersion": {
-                        "title": "Model Version",
-                        "type": "string",
-                        "default": "1",
-                        "readOnly": "True"
-                      },
-                      "modelCustomizationId": {
-                        "title": "Customization ID",
-                        "type": "string",
-                        "default": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
-                        "readOnly": "True"
-                      }
-                    }
-                  },
-                  {
-                    "title": "VFMODULE-Vloadbalancerms..vlb..module-2",
-                    "properties": {
-                      "type": {
-                        "title": "Type",
-                        "type": "string",
-                        "default": "VFMODULE",
-                        "readOnly": "True"
-                      },
-                      "resourceID": {
-                        "title": "Resource ID",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vlb..module-2",
-                        "readOnly": "True"
-                      },
-                      "modelInvariantId": {
-                        "title": "Model Invariant Id (ModelInvariantUUID)",
-                        "type": "string",
-                        "default": "a772a1f4-0064-412c-833d-4749b15828dd",
-                        "readOnly": "True"
-                      },
-                      "modelVersionId": {
-                        "title": "Model Version Id (ModelUUID)",
-                        "type": "string",
-                        "default": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
-                        "readOnly": "True"
-                      },
-                      "modelName": {
-                        "title": "Model Name",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vlb..module-2",
-                        "readOnly": "True"
-                      },
-                      "modelVersion": {
-                        "title": "Model Version",
-                        "type": "string",
-                        "default": "1",
-                        "readOnly": "True"
-                      },
-                      "modelCustomizationId": {
-                        "title": "Customization ID",
-                        "type": "string",
-                        "default": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
-                        "readOnly": "True"
-                      }
-                    }
-                  }
-                ]
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/operational-policy-no-guard-properties.json b/src/test/resources/tosca/operational-policy-no-guard-properties.json
deleted file mode 100644
index fdb1906a4..000000000
--- a/src/test/resources/tosca/operational-policy-no-guard-properties.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"operational_policy": {
-		"controlLoop": {
-			"trigger_policy": "new",
-			"timeout": "0",
-			"abatement": "on",
-			"controlLoopName": "LOOP_iYTIP_v1_0_ResourceInstanceName1_tca"
-		},
-		"policies": [
-			{
-				"id": "new",
-				"recipe": "Restart",
-				"retry": "10",
-				"timeout": "10",
-				"actor": "SO",
-				"payload": "",
-				"success": "",
-				"failure": "",
-				"failure_timeout": "",
-				"failure_retries": "",
-				"failure_exception": "",
-				"failure_guard": "",
-				"target": {
-					"type": "VM",
-					"resourceID": "",
-					"modelInvariantId": "",
-					"modelVersionId": "",
-					"modelName": "",
-					"modelVersion": "",
-					"modelCustomizationId": ""
-				}
-			}
-		]
-	}
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/operational-policy-properties.json b/src/test/resources/tosca/operational-policy-properties.json
deleted file mode 100644
index a38334b55..000000000
--- a/src/test/resources/tosca/operational-policy-properties.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "operational_policy": {
-    "controlLoop": {
-      "timeout": "0",
-      "abatement": "True",
-      "trigger_policy": "policy1",
-      "controlLoopName": "LOOP_ASJOy_v1_0_ResourceInstanceName1_tca"
-    },
-    "policies": [
-      {
-        "actor": {
-          "actor": "APPC",
-          "recipe": "Restart",
-          "payload": "requestParameters: '{\"usePreload\":true,\"userParams\":[]}'\r\nconfigurationParameters: '[{\"ip-addr\":\"$.vf-module-topology.vf-module-parameters.param[10].value\",\"oam-ip-addr\":\"$.vf-module-topology.vf-module-parameters.param[15].value\",\"enabled\":\"$.vf-module-topology.vf-module-parameters.param[22].value\"}]'"
-        },
-        "id": "policy1",
-        "retry": "0",
-        "timeout": "0",
-        "success": "final_success",
-        "failure": "policy2",
-        "failure_timeout": "final_failure_timeout",
-        "failure_retries": "final_failure_retries",
-        "failure_exception": "final_failure_exception",
-        "failure_guard": "final_failure_guard",
-        "target": {
-          "type": "VNF",
-          "resourceID": "vLoadBalancerMS"
-        }
-      },
-      {
-        "actor": {
-          "actor": "SO",
-          "recipe": "VF Module Create",
-          "payload": ""
-        },
-        "id": "policy2",
-        "retry": "0",
-        "timeout": "0",
-        "success": "final_success",
-        "failure": "final_failure",
-        "failure_timeout": "final_failure_timeout",
-        "failure_retries": "final_failure_retries",
-        "failure_exception": "final_failure_exception",
-        "failure_guard": "final_failure_guard",
-        "target": {
-          "type": "VFMODULE",
-          "resourceID": "Vloadbalancerms..vpkg..module-1",
-          "modelInvariantId": "ca052563-eb92-4b5b-ad41-9111768ce043",
-          "modelVersionId": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-          "modelName": "Vloadbalancerms..vpkg..module-1",
-          "modelVersion": "1",
-          "modelCustomizationId": "1bffdc31-a37d-4dee-b65c-dde623a76e52"
-        }
-      },
-      {
-        "actor": {
-          "actor": "CDS",
-          "recipe": {
-            "recipe": "resource-assignment",
-            "payload": {
-              "artifact_name": "baseconfiguration",
-              "artifact_version": "1.0.0",
-              "mode": "async",
-              "data": {
-                "resource-assignment-properties": {
-                  "request-id": "request-id",
-                  "service-instance-id": "service-instance-id",
-                  "vnf-id": "vnf-id",
-                  "action-name": "action-name",
-                  "scope-type": "scope-type",
-                  "hostname": "hostname",
-                  "vnf_name": "vnf_name"
-                }
-              }
-            }
-          }
-        },
-        "id": "policy3",
-        "retry": "0",
-        "timeout": "0",
-        "success": "final_success",
-        "failure": "final_failure",
-        "failure_timeout": "final_failure_timeout",
-        "failure_retries": "final_failure_retries",
-        "failure_exception": "final_failure_exception",
-        "failure_guard": "final_failure_guard",
-        "target": {
-          "type": "VFMODULE",
-          "resourceID": "Vloadbalancerms..vpkg..module-1",
-          "modelInvariantId": "ca052563-eb92-4b5b-ad41-9111768ce043",
-          "modelVersionId": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-          "modelName": "Vloadbalancerms..vpkg..module-1",
-          "modelVersion": "1",
-          "modelCustomizationId": "1bffdc31-a37d-4dee-b65c-dde623a76e52"
-        }
-      },
-      {
-        "actor": {
-          "actor": "CDS",
-          "recipe": {
-            "recipe": "modify-config",
-            "payload": {
-              "artifact_name": "baseconfiguration",
-              "artifact_version": "1.0.0",
-              "mode": "async",
-              "data": {
-              }
-            }
-          }
-        },
-        "id": "policy4",
-        "retry": "0",
-        "timeout": "0",
-        "success": "final_success",
-        "failure": "final_failure",
-        "failure_timeout": "final_failure_timeout",
-        "failure_retries": "final_failure_retries",
-        "failure_exception": "final_failure_exception",
-        "failure_guard": "final_failure_guard",
-        "target": {
-          "type": "VFMODULE",
-          "resourceID": "Vloadbalancerms..vpkg..module-1",
-          "modelInvariantId": "ca052563-eb92-4b5b-ad41-9111768ce043",
-          "modelVersionId": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-          "modelName": "Vloadbalancerms..vpkg..module-1",
-          "modelVersion": "1",
-          "modelCustomizationId": "1bffdc31-a37d-4dee-b65c-dde623a76e52"
-        }
-      }
-    ]
-  }
-}
diff --git a/src/test/resources/tosca/pdp-group-policy-payload.json b/src/test/resources/tosca/pdp-group-policy-payload.json
deleted file mode 100644
index 17535ecbb..000000000
--- a/src/test/resources/tosca/pdp-group-policy-payload.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "groups": [
-    {
-      "name": "pdpGroup1",
-      "deploymentSubgroups": [
-        {
-          "pdpType": "pdpSubgroup1",
-          "action": "POST",
-          "policies": [
-            {
-              "name": "configPolicyTest",
-              "version": "1.0.0"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "pdpGroup2",
-      "deploymentSubgroups": [
-        {
-          "pdpType": "pdpSubgroup2",
-          "action": "POST",
-          "policies": [
-            {
-              "name": "opLegacyPolicy",
-              "version": "1.0.0"
-            },
-            {
-              "name": "opPolicy",
-              "version": "1.0.0"
-            }
-          ]
-        },
-        {
-          "pdpType": "pdpSubgroup1",
-          "action": "POST",
-          "policies": [
-            {
-              "name": "configPolicyTest2",
-              "version": "1.0.0"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/policy-yaml-to-json-with-constraints.json b/src/test/resources/tosca/policy-yaml-to-json-with-constraints.json
deleted file mode 100644
index fe9b84d13..000000000
--- a/src/test/resources/tosca/policy-yaml-to-json-with-constraints.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "schema": {
-        "uniqueItems": "true",
-        "format": "tabs",
-        "type": "array",
-        "title": "Properties with constraints",
-        "items": {
-            "type": "object",
-            "title": "Properties with constraints",
-            "required": [
-                "cpus",
-                "memSize"
-            ],
-            "properties": {
-                "appPassword": {
-                    "propertyOrder": 1004,
-                    "minLength": 6,
-                    "title": "application password",
-                    "type": "string",
-                    "maxLength": 10
-                },
-                "cost": {
-                    "exclusiveMaximum": 100.5,
-                    "propertyOrder": 1005,
-                    "type": "integer",
-                    "exclusiveMinimum": 50.5
-                },
-                "keylength": {
-                    "propertyOrder": 1007,
-                    "type": "integer",
-                    "enum": [
-                        128,
-                        256
-                    ]
-                },
-                "cpus": {
-                    "propertyOrder": 1001,
-                    "default": 1,
-                    "minLength": 1,
-                    "type": "string",
-                    "maxLength": 4
-                },
-                "ports": {
-                    "propertyOrder": 1002,
-                    "maximum": 9010,
-                    "type": "integer",
-                    "minimum": 9000
-                },
-                "memSize": {
-                    "propertyOrder": 1003,
-                    "maximum": 10,
-                    "title": "memory size",
-                    "type": "integer",
-                    "minimum": 2
-                },
-                "algorithm": {
-                    "propertyOrder": 1006,
-                    "type": "string"
-                }
-            }
-        }
-    }
-}
diff --git a/src/test/resources/tosca/policy-yaml-to-json-with-datatypes.json b/src/test/resources/tosca/policy-yaml-to-json-with-datatypes.json
deleted file mode 100644
index ef9c2c03a..000000000
--- a/src/test/resources/tosca/policy-yaml-to-json-with-datatypes.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-    "schema": {
-        "uniqueItems": "true",
-        "format": "tabs",
-        "type": "array",
-        "title": "Properties with different types",
-        "items": {
-            "type": "object",
-            "title": "Properties with different types",
-            "required": [
-                "memSize"
-            ],
-            "properties": {
-                "cpus": {
-                    "propertyOrder": 1001,
-                    "uniqueItems": "true",
-                    "format": "tabs-top",
-                    "type": "array",
-                    "items": {
-                        "type": "object",
-                        "required": [],
-                        "properties": {
-                            "closedLoopControlName": {
-                                "propertyOrder": 1002,
-                                "type": "string"
-                            }
-                        }
-                    }
-                },
-                "domain": {
-                    "propertyOrder": 1009,
-                    "type": "object",
-                    "required": [],
-                    "properties": {
-                        "closedLoopControlName": {
-                            "propertyOrder": 1002,
-                            "type": "string"
-                        }
-                    }
-                },
-                "thresholdValue": {
-                    "propertyOrder": 1007,
-                    "uniqueItems": "true",
-                    "format": "select",
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "ports": {
-                    "propertyOrder": 1003,
-                    "type": "object",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "closedLoopEventStatus": {
-                    "propertyOrder": 1004,
-                    "type": "object",
-                    "items": {
-                        "type": "integer"
-                    }
-                },
-                "version": {
-                    "propertyOrder": 1008,
-                    "uniqueItems": "true",
-                    "format": "tabs-top",
-                    "type": "array",
-                    "items": {
-                        "type": "object",
-                        "required": [],
-                        "properties": {
-                            "closedLoopControlName": {
-                                "propertyOrder": 1002,
-                                "type": "string"
-                            }
-                        }
-                    }
-                },
-                "memSize": {
-                    "propertyOrder": 1006,
-                    "required": [],
-                    "properties": {
-                        "name": {
-                            "propertyOrder": 20002,
-                            "required": [
-                                "severity"
-                            ],
-                            "properties": {
-                                "severity": {
-                                    "propertyOrder": 20003,
-                                    "type": "string"
-                                }
-                            }
-                        }
-                    }
-                },
-                "direction": {
-                    "propertyOrder": 1005,
-                    "type": "object",
-                    "items": {
-                        "type": "integer"
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/policy-yaml-to-json.json b/src/test/resources/tosca/policy-yaml-to-json.json
deleted file mode 100644
index b83d3f24f..000000000
--- a/src/test/resources/tosca/policy-yaml-to-json.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-	"schema": {
-		"uniqueItems": "true",
-		"format": "tabs",
-		"type": "array",
-		"title": "TCA Policy JSON",
-		"items": {
-			"type": "object",
-			"title": "TCA Policy JSON",
-			"required": [
-				"domain",
-				"metricsPerEventName"
-			],
-			"properties": {
-				"domain": {
-					"propertyOrder": 1001,
-					"default": "measurementsForVfScaling",
-					"title": "Domain name to which TCA needs to be applied",
-					"type": "string"
-				},
-				"metricsPerEventName": {
-					"propertyOrder": 1002,
-					"uniqueItems": "true",
-					"format": "tabs-top",
-					"title": "Contains eventName and threshold details that need to be applied to given eventName",
-					"type": "array",
-					"items": {
-						"type": "object",
-						"required": [
-							"controlLoopSchemaType",
-							"eventName",
-							"policyName",
-							"policyScope",
-							"policyVersion",
-							"thresholds"
-						],
-						"properties": {
-							"policyVersion": {
-								"propertyOrder": 1007,
-								"title": "TCA Policy Scope Version",
-								"type": "string"
-							},
-							"thresholds": {
-								"propertyOrder": 1008,
-								"uniqueItems": "true",
-								"format": "tabs-top",
-								"title": "Thresholds associated with eventName",
-								"type": "array",
-								"items": {
-									"type": "object",
-									"required": [
-										"closedLoopControlName",
-										"closedLoopEventStatus",
-										"direction",
-										"fieldPath",
-										"severity",
-										"thresholdValue",
-										"version"
-									],
-									"properties": {
-										"severity": {
-											"propertyOrder": 1013,
-											"title": "Threshold Event Severity",
-											"type": "string",
-											"enum": [
-												"CRITICAL",
-												"MAJOR",
-												"MINOR",
-												"WARNING",
-												"NORMAL"
-											]
-										},
-										"fieldPath": {
-											"propertyOrder": 1012,
-											"title": "Json field Path as per CEF message which needs to be analyzed for TCA",
-											"type": "string",
-											"enum": [
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated",
-												"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated",
-												"$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle",
-												"$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt",
-												"$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice",
-												"$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq",
-												"$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal",
-												"$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem",
-												"$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait",
-												"$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage",
-												"$.event.measurementsForVfScalingFields.meanRequestLatency",
-												"$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered",
-												"$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached",
-												"$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured",
-												"$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree",
-												"$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed",
-												"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
-											]
-										},
-										"thresholdValue": {
-											"propertyOrder": 1014,
-											"title": "Threshold value for the field Path inside CEF message",
-											"type": "integer"
-										},
-										"closedLoopEventStatus": {
-											"propertyOrder": 1010,
-											"title": "Closed Loop Event Status of the threshold",
-											"type": "string",
-											"enum": [
-												"ONSET",
-												"ABATED"
-											]
-										},
-										"closedLoopControlName": {
-											"propertyOrder": 1009,
-											"title": "Closed Loop Control Name associated with the threshold",
-											"type": "string"
-										},
-										"version": {
-											"propertyOrder": 1015,
-											"title": "Version number associated with the threshold",
-											"type": "string"
-										},
-										"direction": {
-											"propertyOrder": 1011,
-											"title": "Direction of the threshold",
-											"type": "string",
-											"enum": [
-												"LESS",
-												"LESS_OR_EQUAL",
-												"GREATER",
-												"GREATER_OR_EQUAL",
-												"EQUAL"
-											]
-										}
-									}
-								}
-							},
-							"policyName": {
-								"propertyOrder": 1005,
-								"title": "TCA Policy Scope Name",
-								"type": "string"
-							},
-							"controlLoopSchemaType": {
-								"propertyOrder": 1003,
-								"title": "Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",
-								"type": "string",
-								"enum": [
-									"VM",
-									"VNF"
-								]
-							},
-							"policyScope": {
-								"propertyOrder": 1006,
-								"title": "TCA Policy Scope",
-								"type": "string"
-							},
-							"eventName": {
-								"propertyOrder": 1004,
-								"title": "Event name to which thresholds need to be applied",
-								"type": "string"
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/resource-details-cds.json b/src/test/resources/tosca/resource-details-cds.json
deleted file mode 100644
index d972d0cb9..000000000
--- a/src/test/resources/tosca/resource-details-cds.json
+++ /dev/null
@@ -1,336 +0,0 @@
-{
-	"CP": {
-	},
-	"VL": {
-	},
-	"VF": {
-		"vLoadBalancerMS 0": {
-			"resourceVendor": "Test",
-			"resourceVendorModelNumber": "",
-			"name": "vLoadBalancerMS",
-			"description": "vLBMS",
-			"invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
-			"subcategory": "Load Balancer",
-			"category": "Application L4+",
-			"type": "VF",
-			"UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
-			"version": "1.0",
-			"resourceVendorRelease": "1.0",
-			"customizationUUID": "465246dc-7748-45f4-a013-308d92922552",
-				"controllerProperties": {
-					"sdnc_model_name": "baseconfiguration",
-					"sdnc_model_version": "1.0.0",
-					"workflows": {
-						"resource-assignment": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate": {
-							"inputs": {
-								"activate-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate-restconf": {
-							"inputs": {
-								"activate-restconf-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate-cli": {
-							"inputs": {
-								"activate-cli-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"assign-activate": {
-							"inputs": {
-								"assign-activate-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"imperative-test-wf": {
-							"inputs": {
-								"imperative-test-wf-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						} 
-				 }
-		}
-		}
-	},
-	"CR": {
-	},
-	"VFC": {
-	},
-	"PNF": {
-	},
-	"Service": {
-	},
-	"CVFC": {
-	},
-	"Service Proxy": {
-	},
-	"Configuration": {
-	},
-	"AllottedResource": {
-	},
-	"VFModule": {
-		"Vloadbalancerms..vpkg..module-1": {
-			"vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
-			"vfModuleModelVersion": "1",
-			"vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
-			"vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-			"vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
-			"min_vf_module_instances": 0,
-			"vf_module_label": "vpkg",
-			"max_vf_module_instances": 1,
-			"vf_module_type": "Expansion",
-			"isBase": false,
-			"initial_count": 0,
-			"volume_group": false
-		},
-		"Vloadbalancerms..vdns..module-3": {
-			"vfModuleModelInvariantUUID": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
-			"vfModuleModelVersion": "1",
-			"vfModuleModelName": "Vloadbalancerms..vdns..module-3",
-			"vfModuleModelUUID": "4fa73b49-8a6c-493e-816b-eb401567b720",
-			"vfModuleModelCustomizationUUID": "bafcdab0-801d-4d81-9ead-f464640a38b1",
-			"min_vf_module_instances": 0,
-			"vf_module_label": "vdns",
-			"max_vf_module_instances": 50,
-			"vf_module_type": "Expansion",
-			"isBase": false,
-			"initial_count": 0,
-			"volume_group": false
-		},
-		"Vloadbalancerms..base_template..module-0": {
-			"vfModuleModelInvariantUUID": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
-			"vfModuleModelVersion": "1",
-			"vfModuleModelName": "Vloadbalancerms..base_template..module-0",
-			"vfModuleModelUUID": "63734409-f745-4e4d-a38b-131638a0edce",
-			"vfModuleModelCustomizationUUID": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
-			"min_vf_module_instances": 1,
-			"vf_module_label": "base_template",
-			"max_vf_module_instances": 1,
-			"vf_module_type": "Base",
-			"isBase": true,
-			"initial_count": 1,
-			"volume_group": false
-		},
-		"Vloadbalancerms..vlb..module-2": {
-			"vfModuleModelInvariantUUID": "a772a1f4-0064-412c-833d-4749b15828dd",
-			"vfModuleModelVersion": "1",
-			"vfModuleModelName": "Vloadbalancerms..vlb..module-2",
-			"vfModuleModelUUID": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
-			"vfModuleModelCustomizationUUID": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
-			"min_vf_module_instances": 0,
-			"vf_module_label": "vlb",
-			"max_vf_module_instances": 1,
-			"vf_module_type": "Expansion",
-			"isBase": false,
-			"initial_count": 0,
-			"volume_group": false
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/resource-details.json b/src/test/resources/tosca/resource-details.json
deleted file mode 100644
index b55adbf52..000000000
--- a/src/test/resources/tosca/resource-details.json
+++ /dev/null
@@ -1,336 +0,0 @@
-{
-	"CP": {
-	},
-	"VL": {
-	},
-	"VF": {
-		"vLoadBalancerMS 0": {
-			"resourceVendor": "Test",
-			"resourceVendorModelNumber": "",
-			"name": "vLoadBalancerMS",
-			"description": "vLBMS",
-			"invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
-			"subcategory": "Load Balancer",
-			"category": "Application L4+",
-			"type": "VF",
-			"UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
-			"version": "1.0",
-			"resourceVendorRelease": "1.0",
-			"customizationUUID": "465246dc-7748-45f4-a013-308d92922552",
-				"controllerProperties": {
-					"sdnc_model_name": "baseconfiguration",
-					"sdnc_model_version": "1.0.0",
-					"workflows": {
-						"resource-assignment": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate-restconf": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate-cli": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"assign-activate": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"imperative-test-wf": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						} 
-				 }
-		}
-		}
-	},
-	"CR": {
-	},
-	"VFC": {
-	},
-	"PNF": {
-	},
-	"Service": {
-	},
-	"CVFC": {
-	},
-	"Service Proxy": {
-	},
-	"Configuration": {
-	},
-	"AllottedResource": {
-	},
-	"VFModule": {
-		"Vloadbalancerms..vpkg..module-1": {
-			"vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
-			"vfModuleModelVersion": "1",
-			"vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
-			"vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-			"vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
-			"min_vf_module_instances": 0,
-			"vf_module_label": "vpkg",
-			"max_vf_module_instances": 1,
-			"vf_module_type": "Expansion",
-			"isBase": false,
-			"initial_count": 0,
-			"volume_group": false
-		},
-		"Vloadbalancerms..vdns..module-3": {
-			"vfModuleModelInvariantUUID": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
-			"vfModuleModelVersion": "1",
-			"vfModuleModelName": "Vloadbalancerms..vdns..module-3",
-			"vfModuleModelUUID": "4fa73b49-8a6c-493e-816b-eb401567b720",
-			"vfModuleModelCustomizationUUID": "bafcdab0-801d-4d81-9ead-f464640a38b1",
-			"min_vf_module_instances": 0,
-			"vf_module_label": "vdns",
-			"max_vf_module_instances": 50,
-			"vf_module_type": "Expansion",
-			"isBase": false,
-			"initial_count": 0,
-			"volume_group": false
-		},
-		"Vloadbalancerms..base_template..module-0": {
-			"vfModuleModelInvariantUUID": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
-			"vfModuleModelVersion": "1",
-			"vfModuleModelName": "Vloadbalancerms..base_template..module-0",
-			"vfModuleModelUUID": "63734409-f745-4e4d-a38b-131638a0edce",
-			"vfModuleModelCustomizationUUID": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
-			"min_vf_module_instances": 1,
-			"vf_module_label": "base_template",
-			"max_vf_module_instances": 1,
-			"vf_module_type": "Base",
-			"isBase": true,
-			"initial_count": 1,
-			"volume_group": false
-		},
-		"Vloadbalancerms..vlb..module-2": {
-			"vfModuleModelInvariantUUID": "a772a1f4-0064-412c-833d-4749b15828dd",
-			"vfModuleModelVersion": "1",
-			"vfModuleModelName": "Vloadbalancerms..vlb..module-2",
-			"vfModuleModelUUID": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
-			"vfModuleModelCustomizationUUID": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
-			"min_vf_module_instances": 0,
-			"vf_module_label": "vlb",
-			"max_vf_module_instances": 1,
-			"vf_module_type": "Expansion",
-			"isBase": false,
-			"initial_count": 0,
-			"volume_group": false
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/service-details.json b/src/test/resources/tosca/service-details.json
deleted file mode 100644
index f41eec107..000000000
--- a/src/test/resources/tosca/service-details.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"serviceType": "",
-	"namingPolicy": "",
-	"environmentContext": "General_Revenue-Bearing",
-	"serviceEcompNaming": "true",
-	"serviceRole": "",
-	"name": "vLoadBalancerMS",
-	"description": "vLBMS",
-	"invariantUUID": "30ec5b59-4799-48d8-ac5f-1058a6b0e48f",
-	"ecompGeneratedNaming": "true",
-	"category": "Network L4+",
-	"type": "Service",
-	"UUID": "63cac700-ab9a-4115-a74f-7eac85e3fce0",
-	"instantiationType": "A-la-carte"
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/tca_hi_lo.json b/src/test/resources/tosca/tca_hi_lo.json
deleted file mode 100644
index cb3ed893f..000000000
--- a/src/test/resources/tosca/tca_hi_lo.json
+++ /dev/null
@@ -1,179 +0,0 @@
-{
-  "title": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-  "type": "object",
-  "required": [
-    "tca_policy"
-  ],
-  "properties": {
-    "tca_policy": {
-      "title": "onap.datatypes.monitoring.tca_policy",
-      "type": "object",
-      "required": [
-        "domain",
-        "metricsPerEventName"
-      ],
-      "properties": {
-        "domain": {
-          "type": "string",
-          "description": "Domain name to which TCA needs to be applied",
-          "default": "measurementsForVfScaling",
-          "const": "measurementsForVfScaling"
-        },
-        "metricsPerEventName": {
-          "type": "array",
-          "description": "Contains eventName and threshold details that need to be applied to given eventName",
-          "items": {
-            "title": "onap.datatypes.monitoring.metricsPerEventName",
-            "type": "object",
-            "required": [
-              "controlLoopSchemaType",
-              "eventName",
-              "policyName",
-              "policyScope",
-              "policyVersion",
-              "thresholds"
-            ],
-            "properties": {
-              "controlLoopSchemaType": {
-                "type": "string",
-                "description": "Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",
-                "enum": [
-                  "VM",
-                  "VNF"
-                ]
-              },
-              "eventName": {
-                "type": "string",
-                "description": "Event name to which thresholds need to be applied"
-              },
-              "policyName": {
-                "type": "string",
-                "description": "TCA Policy Scope Name"
-              },
-              "policyScope": {
-                "type": "string",
-                "description": "TCA Policy Scope"
-              },
-              "policyVersion": {
-                "type": "string",
-                "description": "TCA Policy Scope Version"
-              },
-              "thresholds": {
-                "type": "array",
-                "description": "Thresholds associated with eventName",
-                "items": {
-                  "title": "onap.datatypes.monitoring.thresholds",
-                  "type": "object",
-                  "required": [
-                    "closedLoopControlName",
-                    "closedLoopEventStatus",
-                    "direction",
-                    "fieldPath",
-                    "severity",
-                    "thresholdValue",
-                    "version"
-                  ],
-                  "properties": {
-                    "closedLoopControlName": {
-                      "type": "string",
-                      "description": "Closed Loop Control Name associated with the threshold"
-                    },
-                    "closedLoopEventStatus": {
-                      "type": "string",
-                      "description": "Closed Loop Event Status of the threshold",
-                      "enum": [
-                        "ONSET",
-                        "ABATED"
-                      ]
-                    },
-                    "direction": {
-                      "type": "string",
-                      "description": "Direction of the threshold",
-                      "enum": [
-                        "LESS",
-                        "LESS_OR_EQUAL",
-                        "GREATER",
-                        "GREATER_OR_EQUAL",
-                        "EQUAL"
-                      ]
-                    },
-                    "fieldPath": {
-                      "type": "string",
-                      "description": "Json field Path as per CEF message which needs to be analyzed for TCA",
-                      "enum": [
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle",
-                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt",
-                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice",
-                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq",
-                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal",
-                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem",
-                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait",
-                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage",
-                        "$.event.measurementsForVfScalingFields.meanRequestLatency",
-                        "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered",
-                        "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached",
-                        "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured",
-                        "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree",
-                        "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed",
-                        "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
-                      ]
-                    },
-                    "severity": {
-                      "type": "string",
-                      "description": "Threshold Event Severity",
-                      "enum": [
-                        "CRITICAL",
-                        "MAJOR",
-                        "MINOR",
-                        "WARNING",
-                        "NORMAL"
-                      ]
-                    },
-                    "thresholdValue": {
-                      "type": "integer",
-                      "description": "Threshold value for the field Path inside CEF message"
-                    },
-                    "version": {
-                      "type": "string",
-                      "description": "Version number associated with the threshold"
-                    }
-                  }
-                },
-                "format": "tabs-top"
-              }
-            }
-          },
-          "format": "tabs-top"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/tosca-with-constraints.yaml b/src/test/resources/tosca/tosca-with-constraints.yaml
deleted file mode 100644
index 959bc483b..000000000
--- a/src/test/resources/tosca/tosca-with-constraints.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-    onap.policies.Monitoring:
-        derived_from: tosca.policies.Root
-        description: a base policy type for all policies that governs monitoring provisioning
-    onap.policies.monitoring.example.app:
-        derived_from: onap.policies.Monitoring
-        version: 1.0.0
-        properties:
-            example_policy:
-                type: map
-                description: Properties with constraints
-                entry_schema:
-                    type: onap.datatypes.monitoring.example_policy
-data_types:
-    onap.datatypes.monitoring.example_policy:
-        derived_from: tosca.datatypes.Root
-        properties:
-            cpus:
-                type: string
-                required: true
-                default: 1
-                constraints:
-                  - in_range: [ 1, 4 ] 
-            ports:
-                type: integer
-                constraints:
-                  - in_range: [ 9000, 9010 ]
-            memSize:
-                type: integer
-                required: true
-                description: memory size
-                constraints:
-                  - greater_or_equal: 2
-                  - less_or_equal: 10
-            appPassword:
-                type: string
-                description: application password
-                constraints:
-                    - min_length: 6
-                    - max_length: 10
-            cost:
-                type: float
-                constraints:
-                    - less_than: 100.50
-                    - greater_than: 50.50
-            algorithm: 
-                type: string
-                constraints:
-                    - equal: aes
-            keylength:
-                type: integer
-                constraints:
-                    - valid_values: [ 128, 256 ]
diff --git a/src/test/resources/tosca/tosca-with-datatypes.yaml b/src/test/resources/tosca/tosca-with-datatypes.yaml
deleted file mode 100644
index 61d5dbcc8..000000000
--- a/src/test/resources/tosca/tosca-with-datatypes.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-    onap.policies.Monitoring:
-        derived_from: tosca.policies.Root
-        description: a base policy type for all policies that governs monitoring provisioning
-    onap.policies.monitoring.example.app:
-        derived_from: onap.policies.Monitoring
-        version: 1.0.0
-        properties:
-            example_policy:
-                type: map
-                description: Properties with different types
-                entry_schema:
-                    type: onap.datatypes.monitoring.example_policy
-data_types:
-    onap.datatypes.monitoring.example2:
-        derived_from: tosca.datatypes.Root
-        properties:
-            closedLoopControlName:
-                type: string
-    onap.datatypes.monitoring.example3:
-        derived_from: tosca.datatypes.Root
-        properties:
-            name:
-                type: onap.datatypes.monitoring.example4  
-    onap.datatypes.monitoring.example4:
-        derived_from: tosca.datatypes.Root
-        properties:
-            severity:
-                type: string
-                required: true  
-    onap.datatypes.monitoring.example_policy:
-        derived_from: tosca.datatypes.Root
-        properties:
-            cpus:
-                type: list
-                entry_schema:
-                    type: onap.datatypes.monitoring.example2
-            ports:
-                type: map
-                entry_schema:
-                    type: string
-            closedLoopEventStatus:
-                type: map
-                entry_schema:
-                    type: integer
-            direction:
-                type: map
-                entry_schema:
-                    type: float
-            memSize:
-                type: onap.datatypes.monitoring.example3
-                required: true
-            thresholdValue:
-                type: list
-                entry_schema:
-                    type: string
-            version:
-                type: list
-                entry_schema:
-                    type: onap.datatypes.monitoring.example2
-            domain:
-                type: onap.datatypes.monitoring.example2
\ No newline at end of file
diff --git a/src/test/resources/tosca/tosca_example.yaml b/src/test/resources/tosca/tosca_example.yaml
deleted file mode 100644
index b0119f887..000000000
--- a/src/test/resources/tosca/tosca_example.yaml
+++ /dev/null
@@ -1,158 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-    onap.policies.Monitoring:
-        derived_from: tosca.policies.Root
-        description: a base policy type for all policies that governs monitoring provisioning
-    onap.policies.monitoring.cdap.tca.hi.lo.app:
-        derived_from: onap.policies.Monitoring
-        version: 1.0.0
-        properties:
-            tca_policy:
-                type: map
-                description: TCA Policy JSON
-                entry_schema:
-                    type: onap.datatypes.monitoring.tca_policy
-data_types:
-    onap.datatypes.monitoring.metricsPerEventName:
-        derived_from: tosca.datatypes.Root
-        properties:
-            controlLoopSchemaType:
-                type: string
-                required: true
-                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM
-                constraints:
-                  - valid_values:
-                      - VM
-                      - VNF
-            eventName:
-                type: string
-                required: true
-                description: Event name to which thresholds need to be applied
-            policyName:
-                type: string
-                required: true
-                description: TCA Policy Scope Name
-            policyScope:
-                type: string
-                required: true
-                description: TCA Policy Scope
-            policyVersion:
-                type: string
-                required: true
-                description: TCA Policy Scope Version
-            thresholds:
-                type: list
-                required: true
-                description: Thresholds associated with eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.thresholds
-    onap.datatypes.monitoring.tca_policy:
-        derived_from: tosca.datatypes.Root
-        properties:
-            domain:
-                type: string
-                required: true
-                description: Domain name to which TCA needs to be applied
-                default: measurementsForVfScaling
-                constraints:
-                  - equal: measurementsForVfScaling
-            metricsPerEventName:
-                type: list
-                required: true
-                description: Contains eventName and threshold details that need to be applied to given eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.metricsPerEventName
-    onap.datatypes.monitoring.thresholds:
-        derived_from: tosca.datatypes.Root
-        properties:
-            closedLoopControlName:
-                type: string
-                required: true
-                description: Closed Loop Control Name associated with the threshold
-            closedLoopEventStatus:
-                type: string
-                required: true
-                description: Closed Loop Event Status of the threshold
-                constraints:
-                  - valid_values:
-                      - ONSET
-                      - ABATED
-            direction:
-                type: string
-                required: true
-                description: Direction of the threshold
-                constraints:
-                  - valid_values:
-                      - LESS
-                      - LESS_OR_EQUAL
-                      - GREATER
-                      - GREATER_OR_EQUAL
-                      - EQUAL
-            fieldPath:
-                type: string
-                required: true
-                description: Json field Path as per CEF message which needs to be analyzed for TCA
-                constraints:
-                  - valid_values:
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage
-                      - $.event.measurementsForVfScalingFields.meanRequestLatency
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed
-                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value
-            severity:
-                type: string
-                required: true
-                description: Threshold Event Severity
-                constraints:
-                  - valid_values:
-                      - CRITICAL
-                      - MAJOR
-                      - MINOR
-                      - WARNING
-                      - NORMAL
-            thresholdValue:
-                type: integer
-                required: true
-                description: Threshold value for the field Path inside CEF message
-            version:
-                type: string
-                required: true
-                description: Version number associated with the threshold
diff --git a/src/test/resources/tosca/tosca_metadata_clamp_possible_values.yaml b/src/test/resources/tosca/tosca_metadata_clamp_possible_values.yaml
deleted file mode 100644
index 4d3c3dff2..000000000
--- a/src/test/resources/tosca/tosca_metadata_clamp_possible_values.yaml
+++ /dev/null
@@ -1,184 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-    onap.policies.Monitoring:
-        derived_from: tosca.policies.Root
-        description: a base policy type for all policies that governs monitoring provisioning
-    onap.policies.monitoring.cdap.tca.hi.lo.app:
-        derived_from: onap.policies.Monitoring
-        version: 1.0.0
-        properties:
-            tca_policy:
-                type: map
-                description: TCA Policy JSON
-                entry_schema:
-                    type: onap.datatypes.monitoring.tca_policy
-        metadata:
-            policy_model_type: onap.policies.monitoring.cdap.tca.hi.lo.app
-            acronym: tca
-            
-data_types:
-    onap.datatypes.monitoring.metricsPerEventName:
-        derived_from: tosca.datatypes.Root
-        properties:
-            controlLoopSchemaType:
-                type: string
-                required: true
-                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM
-                constraints:
-                  - valid_values:
-                      - VM
-                      - VNF
-            eventName:
-                type: string
-                required: true
-                description: Event name to which thresholds need to be applied
-            policyName:
-                type: string
-                required: true
-                description: TCA Policy Scope Name
-            policyScope:
-                type: string
-                required: true
-                description: TCA Policy Scope
-            policyVersion:
-                type: string
-                required: true
-                description: TCA Policy Scope Version
-            thresholds:
-                type: list
-                required: true
-                description: Thresholds associated with eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.thresholds
-            context:
-                type: string
-                required: true
-                description: TCA Policy Dummy Context
-                metadata:
-                    clamp_possible_values: ["Dictionary:Context"]
-
-            signature:
-                type: onap.datatypes.monitoring.Dummy_Signature
-                description: Signature
-                required: true
-        
-    onap.datatypes.monitoring.Dummy_Signature:
-        derived_from: tosca.datatypes.Root
-        properties:
-            filter_clause:
-                type: string
-                description: Filter Clause
-                required: true
-                metadata:
-                    clamp_possible_values: ["Dictionary:EventDictionary#Operators"]
-            
-    onap.datatypes.monitoring.tca_policy:
-        derived_from: tosca.datatypes.Root
-        properties:
-            domain:
-                type: string
-                required: true
-                description: Domain name to which TCA needs to be applied
-                default: measurementsForVfScaling
-                constraints:
-                  - equal: measurementsForVfScaling
-            metricsPerEventName:
-                type: list
-                required: true
-                description: Contains eventName and threshold details that need to be applied to given eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.metricsPerEventName
-    onap.datatypes.monitoring.thresholds:
-        derived_from: tosca.datatypes.Root
-        properties:
-            closedLoopControlName:
-                type: string
-                required: true
-                description: Closed Loop Control Name associated with the threshold
-            closedLoopEventStatus:
-                type: string
-                required: true
-                description: Closed Loop Event Status of the threshold
-                constraints:
-                  - valid_values:
-                      - ONSET
-                      - ABATED
-            direction:
-                type: string
-                required: true
-                description: Direction of the threshold
-                constraints:
-                  - valid_values:
-                      - LESS
-                      - LESS_OR_EQUAL
-                      - GREATER
-                      - GREATER_OR_EQUAL
-                      - EQUAL
-            fieldPath:
-                type: string
-                required: true
-                description: Json field Path as per CEF message which needs to be analyzed for TCA
-                constraints:
-                  - valid_values:
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage
-                      - $.event.measurementsForVfScalingFields.meanRequestLatency
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed
-                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value
-            severity:
-                type: string
-                required: true
-                description: Threshold Event Severity
-                constraints:
-                  - valid_values:
-                      - CRITICAL
-                      - MAJOR
-                      - MINOR
-                      - WARNING
-                      - NORMAL
-            thresholdValue:
-                type: integer
-                required: true
-                description: Threshold value for the field Path inside CEF message
-            version:
-                type: string
-                required: true
-                description: Version number associated with the threshold
diff --git a/src/test/resources/tosca/tosca_metadata_clamp_possible_values_json_schema.json b/src/test/resources/tosca/tosca_metadata_clamp_possible_values_json_schema.json
deleted file mode 100644
index 418ee71be..000000000
--- a/src/test/resources/tosca/tosca_metadata_clamp_possible_values_json_schema.json
+++ /dev/null
@@ -1,249 +0,0 @@
-{
-   "schema":{
-      "uniqueItems":"true",
-      "format":"tabs",
-      "type":"array",
-      "title":"TCA Policy JSON",
-      "items":{
-         "type":"object",
-         "title":"TCA Policy JSON",
-         "required":[
-            "domain",
-            "metricsPerEventName"
-         ],
-         "properties":{
-            "domain":{
-               "propertyOrder":1001,
-               "default":"measurementsForVfScaling",
-               "title":"Domain name to which TCA needs to be applied",
-               "type":"string"
-            },
-            "metricsPerEventName":{
-               "propertyOrder":1002,
-               "uniqueItems":"true",
-               "format":"tabs-top",
-               "title":"Contains eventName and threshold details that need to be applied to given eventName",
-               "type":"array",
-               "items":{
-                  "type":"object",
-                  "required":[
-                     "controlLoopSchemaType",
-                     "eventName",
-                     "policyName",
-                     "policyScope",
-                     "policyVersion",
-                     "thresholds",
-                     "context",
-                     "signature"
-                  ],
-                  "properties":{
-                     "policyVersion":{
-                        "propertyOrder":1007,
-                        "title":"TCA Policy Scope Version",
-                        "type":"string"
-                     },
-                     "thresholds":{
-                        "propertyOrder":1008,
-                        "uniqueItems":"true",
-                        "format":"tabs-top",
-                        "title":"Thresholds associated with eventName",
-                        "type":"array",
-                        "items":{
-                           "type":"object",
-                           "required":[
-                              "closedLoopControlName",
-                              "closedLoopEventStatus",
-                              "direction",
-                              "fieldPath",
-                              "severity",
-                              "thresholdValue",
-                              "version"
-                           ],
-                           "properties":{
-                              "severity":{
-                                 "propertyOrder":1013,
-                                 "title":"Threshold Event Severity",
-                                 "type":"string",
-                                 "enum":[
-                                    "CRITICAL",
-                                    "MAJOR",
-                                    "MINOR",
-                                    "WARNING",
-                                    "NORMAL"
-                                 ]
-                              },
-                              "fieldPath":{
-                                 "propertyOrder":1012,
-                                 "title":"Json field Path as per CEF message which needs to be analyzed for TCA",
-                                 "type":"string",
-                                 "enum":[
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage",
-                                    "$.event.measurementsForVfScalingFields.meanRequestLatency",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed",
-                                    "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
-                                 ]
-                              },
-                              "thresholdValue":{
-                                 "propertyOrder":1014,
-                                 "title":"Threshold value for the field Path inside CEF message",
-                                 "type":"integer"
-                              },
-                              "closedLoopEventStatus":{
-                                 "propertyOrder":1010,
-                                 "title":"Closed Loop Event Status of the threshold",
-                                 "type":"string",
-                                 "enum":[
-                                    "ONSET",
-                                    "ABATED"
-                                 ]
-                              },
-                              "closedLoopControlName":{
-                                 "propertyOrder":1009,
-                                 "title":"Closed Loop Control Name associated with the threshold",
-                                 "type":"string"
-                              },
-                              "version":{
-                                 "propertyOrder":1015,
-                                 "title":"Version number associated with the threshold",
-                                 "type":"string"
-                              },
-                              "direction":{
-                                 "propertyOrder":1011,
-                                 "title":"Direction of the threshold",
-                                 "type":"string",
-                                 "enum":[
-                                    "LESS",
-                                    "LESS_OR_EQUAL",
-                                    "GREATER",
-                                    "GREATER_OR_EQUAL",
-                                    "EQUAL"
-                                 ]
-                              }
-                           }
-                        }
-                     },
-                     "policyName":{
-                        "propertyOrder":1005,
-                        "title":"TCA Policy Scope Name",
-                        "type":"string"
-                     },
-                     "signature":{
-                        "propertyOrder":1017,
-                        "title":"Signature",
-                        "required":[
-                           "filter_clause"
-                        ],
-                        "properties":{
-                           "filter_clause":{
-                              "propertyOrder":30002,
-                              "qschema":{
-                                 "filters":[
-                                    {
-                                       "operators":[
-                                          "equals"
-                                       ],
-                                       "minLength":1,
-                                       "id":"alarmCondition",
-                                       "label":"alarmCondition",
-                                       "type":"string"
-                                    },
-                                    {
-                                       "plugin":"datetimepicker",
-                                       "operators":[
-                                          "equals"
-                                       ],
-                                       "minLength":1,
-                                       "id":"timeEpoch",
-                                       "label":"timeEpoch",
-                                       "type":"datetime",
-                                       "input_event":"dp.change",
-                                       "validation":{
-                                          "format":"YYYY/MM/DD HH:mm:ss"
-                                       }
-                                    }
-                                 ]
-                              },
-                              "minLength":1,
-                              "title":"Filter Clause",
-                              "type":"qbldr"
-                           }
-                        }
-                     },
-                     "controlLoopSchemaType":{
-                        "propertyOrder":1003,
-                        "title":"Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",
-                        "type":"string",
-                        "enum":[
-                           "VM",
-                           "VNF"
-                        ]
-                     },
-                     "policyScope":{
-                        "propertyOrder":1006,
-                        "title":"TCA Policy Scope",
-                        "type":"string"
-                     },
-                     "context":{
-                        "propertyOrder":1016,
-                        "options":{
-                           "enum_titles":[
-                              "PROD"
-                           ]
-                        },
-                        "title":"TCA Policy Dummy Context",
-                        "type":"string",
-                        "enum":[
-                           "PROD"
-                        ]
-                     },
-                     "eventName":{
-                        "propertyOrder":1004,
-                        "title":"Event name to which thresholds need to be applied",
-                        "type":"string"
-                     }
-                  }
-               }
-            }
-         }
-      }
-   }
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/tosca_with_date_time_json_schema.json b/src/test/resources/tosca/tosca_with_date_time_json_schema.json
deleted file mode 100644
index e15942cc5..000000000
--- a/src/test/resources/tosca/tosca_with_date_time_json_schema.json
+++ /dev/null
@@ -1,240 +0,0 @@
-{
-   "schema":{
-      "uniqueItems":"true",
-      "format":"tabs",
-      "type":"array",
-      "title":"TCA Policy JSON",
-      "items":{
-         "type":"object",
-         "title":"TCA Policy JSON",
-         "required":[
-            "domain",
-            "metricsPerEventName"
-         ],
-         "properties":{
-            "domain":{
-               "propertyOrder":1001,
-               "default":"measurementsForVfScaling",
-               "title":"Domain name to which TCA needs to be applied",
-               "type":"string"
-            },
-            "metricsPerEventName":{
-               "propertyOrder":1002,
-               "uniqueItems":"true",
-               "format":"tabs-top",
-               "title":"Contains eventName and threshold details that need to be applied to given eventName",
-               "type":"array",
-               "items":{
-                  "type":"object",
-                  "required":[
-                     "controlLoopSchemaType",
-                     "eventName",
-                     "policyName",
-                     "policyScope",
-                     "policyVersion",
-                     "thresholds",
-                     "context",
-                     "signature"
-                  ],
-                  "properties":{
-                     "policyVersion":{
-                        "propertyOrder":1007,
-                        "title":"TCA Policy Scope Version",
-                        "type":"string"
-                     },
-                     "thresholds":{
-                        "propertyOrder":1008,
-                        "uniqueItems":"true",
-                        "format":"tabs-top",
-                        "title":"Thresholds associated with eventName",
-                        "type":"array",
-                        "items":{
-                           "type":"object",
-                           "required":[
-                              "closedLoopControlName",
-                              "closedLoopEventStatus",
-                              "direction",
-                              "fieldPath",
-                              "severity",
-                              "thresholdValue",
-                              "version"
-                           ],
-                           "properties":{
-                              "severity":{
-                                 "propertyOrder":1013,
-                                 "title":"Threshold Event Severity",
-                                 "type":"string",
-                                 "enum":[
-                                    "CRITICAL",
-                                    "MAJOR",
-                                    "MINOR",
-                                    "WARNING",
-                                    "NORMAL"
-                                 ]
-                              },
-                              "fieldPath":{
-                                 "propertyOrder":1012,
-                                 "title":"Json field Path as per CEF message which needs to be analyzed for TCA",
-                                 "type":"string",
-                                 "enum":[
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage",
-                                    "$.event.measurementsForVfScalingFields.meanRequestLatency",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed",
-                                    "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
-                                 ]
-                              },
-                              "thresholdValue":{
-                                 "propertyOrder":1014,
-                                 "title":"Threshold value for the field Path inside CEF message",
-                                 "type":"integer"
-                              },
-                              "closedLoopEventStatus":{
-                                 "propertyOrder":1010,
-                                 "title":"Closed Loop Event Status of the threshold",
-                                 "type":"string",
-                                 "enum":[
-                                    "ONSET",
-                                    "ABATED"
-                                 ]
-                              },
-                              "closedLoopControlName":{
-                                 "propertyOrder":1009,
-                                 "title":"Closed Loop Control Name associated with the threshold",
-                                 "type":"string"
-                              },
-                              "version":{
-                                 "propertyOrder":1015,
-                                 "title":"Version number associated with the threshold",
-                                 "type":"string"
-                              },
-                              "direction":{
-                                 "propertyOrder":1011,
-                                 "title":"Direction of the threshold",
-                                 "type":"string",
-                                 "enum":[
-                                    "LESS",
-                                    "LESS_OR_EQUAL",
-                                    "GREATER",
-                                    "GREATER_OR_EQUAL",
-                                    "EQUAL"
-                                 ]
-                              }
-                           }
-                        }
-                     },
-                     "policyName":{
-                        "propertyOrder":1005,
-                        "title":"TCA Policy Scope Name",
-                        "type":"string"
-                     },
-                     "signature":{
-                        "propertyOrder":1017,
-                        "title":"Signature",
-                        "required":[
-                           "filter_clause"
-                        ],
-                        "properties":{
-                           "filter_clause":{
-                              "propertyOrder":30002,
-                              "qschema":{
-                                 "filters":[
-                                    {
-                                       "plugin":"datetimepicker",
-                                       "operators":[
-                                          "equals"
-                                       ],
-                                       "minLength":1,
-                                       "id":"timeEpoch",
-                                       "label":"timeEpoch",
-                                       "type":"datetime",
-                                       "input_event":"dp.change",
-                                       "validation":{
-                                          "format":"YYYY/MM/DD HH:mm:ss"
-                                       }
-                                    }
-                                 ]
-                              },
-                              "minLength":1,
-                              "title":"Filter Clause",
-                              "type":"qbldr"
-                           }
-                        }
-                     },
-                     "controlLoopSchemaType":{
-                        "propertyOrder":1003,
-                        "title":"Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",
-                        "type":"string",
-                        "enum":[
-                           "VM",
-                           "VNF"
-                        ]
-                     },
-                     "policyScope":{
-                        "propertyOrder":1006,
-                        "title":"TCA Policy Scope",
-                        "type":"string"
-                     },
-                     "context":{
-                        "propertyOrder":1016,
-                        "options":{
-                           "enum_titles":[
-                              "PROD"
-                           ]
-                        },
-                        "title":"TCA Policy Dummy Context",
-                        "type":"string",
-                        "enum":[
-                           "PROD"
-                        ]
-                     },
-                     "eventName":{
-                        "propertyOrder":1004,
-                        "title":"Event name to which thresholds need to be applied",
-                        "type":"string"
-                     }
-                  }
-               }
-            }
-         }
-      }
-   }
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/tosca_with_metadata.yaml b/src/test/resources/tosca/tosca_with_metadata.yaml
deleted file mode 100644
index 5967d1569..000000000
--- a/src/test/resources/tosca/tosca_with_metadata.yaml
+++ /dev/null
@@ -1,162 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-    onap.policies.Monitoring:
-        derived_from: tosca.policies.Root
-        description: a base policy type for all policies that governs monitoring provisioning
-    onap.policies.monitoring.cdap.tca.hi.lo.app:
-        derived_from: onap.policies.Monitoring
-        version: 1.0.0
-        properties:
-            tca_policy:
-                type: map
-                description: TCA Policy JSON
-                entry_schema:
-                    type: onap.datatypes.monitoring.tca_policy
-        metadata:
-            policy_model_type: onap.policies.monitoring.cdap.tca.hi.lo.app
-            acronym: tca
-            
-data_types:
-    onap.datatypes.monitoring.metricsPerEventName:
-        derived_from: tosca.datatypes.Root
-        properties:
-            controlLoopSchemaType:
-                type: string
-                required: true
-                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM
-                constraints:
-                  - valid_values:
-                      - VM
-                      - VNF
-            eventName:
-                type: string
-                required: true
-                description: Event name to which thresholds need to be applied
-            policyName:
-                type: string
-                required: true
-                description: TCA Policy Scope Name
-            policyScope:
-                type: string
-                required: true
-                description: TCA Policy Scope
-            policyVersion:
-                type: string
-                required: true
-                description: TCA Policy Scope Version
-            thresholds:
-                type: list
-                required: true
-                description: Thresholds associated with eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.thresholds
-    onap.datatypes.monitoring.tca_policy:
-        derived_from: tosca.datatypes.Root
-        properties:
-            domain:
-                type: string
-                required: true
-                description: Domain name to which TCA needs to be applied
-                default: measurementsForVfScaling
-                constraints:
-                  - equal: measurementsForVfScaling
-            metricsPerEventName:
-                type: list
-                required: true
-                description: Contains eventName and threshold details that need to be applied to given eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.metricsPerEventName
-    onap.datatypes.monitoring.thresholds:
-        derived_from: tosca.datatypes.Root
-        properties:
-            closedLoopControlName:
-                type: string
-                required: true
-                description: Closed Loop Control Name associated with the threshold
-            closedLoopEventStatus:
-                type: string
-                required: true
-                description: Closed Loop Event Status of the threshold
-                constraints:
-                  - valid_values:
-                      - ONSET
-                      - ABATED
-            direction:
-                type: string
-                required: true
-                description: Direction of the threshold
-                constraints:
-                  - valid_values:
-                      - LESS
-                      - LESS_OR_EQUAL
-                      - GREATER
-                      - GREATER_OR_EQUAL
-                      - EQUAL
-            fieldPath:
-                type: string
-                required: true
-                description: Json field Path as per CEF message which needs to be analyzed for TCA
-                constraints:
-                  - valid_values:
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage
-                      - $.event.measurementsForVfScalingFields.meanRequestLatency
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed
-                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value
-            severity:
-                type: string
-                required: true
-                description: Threshold Event Severity
-                constraints:
-                  - valid_values:
-                      - CRITICAL
-                      - MAJOR
-                      - MINOR
-                      - WARNING
-                      - NORMAL
-            thresholdValue:
-                type: integer
-                required: true
-                description: Threshold value for the field Path inside CEF message
-            version:
-                type: string
-                required: true
-                description: Version number associated with the threshold