Merge "Removal of useless test files"

9 files changed, 174 insertions, 813 deletions

diff --git a/src/test/resources/tosca/base.yaml b/src/test/resources/tosca/base.yaml
deleted file mode 100644
index 3d31cd203..000000000
--- a/src/test/resources/tosca/base.yaml
+++ /dev/null
@@ -1,171 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-topology_template:
-  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.Failure
-
-      onap.policies.controlloop.operational.common.Apex:
-          derived_from: onap.policies.controlloop.operational.Common
-          type_version: 1.0.0
-          version: 1.0.0
-          description: Operational policies for Apex PDP
-          properties:
-
-      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]
-                - values: [4.5, false]
-
-    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
-
-    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/guard1-policy-payload.json b/src/test/resources/tosca/guard1-policy-payload.json
deleted file mode 100644
index 1c03df306..000000000
--- a/src/test/resources/tosca/guard1-policy-payload.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"policy-id": "guard.minmax.new",
-	"content": {
-		"actor": "APPC",
-		"recipe": "Restart",
-		"targets": ".*",
-		"clname": "LOOP_ASJOy_v1_0_ResourceInstanceName1_tca",
-		"guardActiveStart": "00:00:00Z",
-		"guardActiveEnd": "10:00:00Z",
-		"min": "0",
-		"max": "1"
-	}
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/guard2-policy-payload.json b/src/test/resources/tosca/guard2-policy-payload.json
deleted file mode 100644
index 559a56840..000000000
--- a/src/test/resources/tosca/guard2-policy-payload.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"policy-id": "guard.frequency.new",
-	"content": {
-		"actor": "APPC",
-		"recipe": "Rebuild",
-		"targets": ".*",
-		"clname": "LOOP_ASJOy_v1_0_ResourceInstanceName1_tca",
-		"guardActiveStart": "00:00:00Z",
-		"guardActiveEnd": "10:00:00Z",
-		"limit": "1",
-		"timeWindow": "2",
-		"timeUnits": "minute"
-	}
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/new-converter/origin.json b/src/test/resources/tosca/new-converter/origin.json
deleted file mode 100644
index da0529d04..000000000
--- a/src/test/resources/tosca/new-converter/origin.json
+++ /dev/null
@@ -1 +0,0 @@
-{"onap.policies.controlloop.operational.common.Drools":{"derived_from":{"onap.policies.controlloop.operational.Common":{"derived_from":"tosca.policies.Root","required":["id","timeout","abatement","trigger","operations"],"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\ntimeout for each operation listed.\n","required":true},"abatement":{"description":"Whether an abatement event message will be expected for the control loop from DCAE.","required":true},"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":{"derived_from":"tosca.datatypes.Root","required":["id","operation","timeout","retries"],"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":{"derived_from":"tosca.datatypes.Root","required":["actor","operation","target"],"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":"some special treatment"}},"payload":{"type":"Map","description":"Name/value pairs of payload information passed by Policy to the actor","required":false,"entry_schema":{"type":"String"}}}}},"description":"The definition of the operation to be performed.","required":true},"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},"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},"failure":{"type":"String","description":"Points to the operation to invoke on Actor operation failure.","required":false},"failure_timeout":{"type":"String","description":"Points to the operation to invoke when the time out for the operation occurs.","required":false},"failure_retries":{"type":"String","description":"Points to the operation to invoke when the current operation has exceeded its max retries.","required":false},"failure_exception":{"type":"String","description":"Points to the operation to invoke when the current operation causes an exception.","required":false},"failure_guard":{"type":"String","description":"Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.","required":false}}}}}}}}},"required":[],"properties":{"controllerName":{"type":"String","description":"Drools controller properties","required":false}}}}
\ No newline at end of file
diff --git a/src/test/resources/tosca/new-converter/rendu.json b/src/test/resources/tosca/new-converter/rendu.json
deleted file mode 100644
index da0529d04..000000000
--- a/src/test/resources/tosca/new-converter/rendu.json
+++ /dev/null
@@ -1 +0,0 @@
-{"onap.policies.controlloop.operational.common.Drools":{"derived_from":{"onap.policies.controlloop.operational.Common":{"derived_from":"tosca.policies.Root","required":["id","timeout","abatement","trigger","operations"],"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\ntimeout for each operation listed.\n","required":true},"abatement":{"description":"Whether an abatement event message will be expected for the control loop from DCAE.","required":true},"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":{"derived_from":"tosca.datatypes.Root","required":["id","operation","timeout","retries"],"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":{"derived_from":"tosca.datatypes.Root","required":["actor","operation","target"],"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":"some special treatment"}},"payload":{"type":"Map","description":"Name/value pairs of payload information passed by Policy to the actor","required":false,"entry_schema":{"type":"String"}}}}},"description":"The definition of the operation to be performed.","required":true},"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},"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},"failure":{"type":"String","description":"Points to the operation to invoke on Actor operation failure.","required":false},"failure_timeout":{"type":"String","description":"Points to the operation to invoke when the time out for the operation occurs.","required":false},"failure_retries":{"type":"String","description":"Points to the operation to invoke when the current operation has exceeded its max retries.","required":false},"failure_exception":{"type":"String","description":"Points to the operation to invoke when the current operation causes an exception.","required":false},"failure_guard":{"type":"String","description":"Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.","required":false}}}}}}}}},"required":[],"properties":{"controllerName":{"type":"String","description":"Drools controller properties","required":false}}}}
\ No newline at end of file
diff --git a/src/test/resources/tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml b/src/test/resources/tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml
index 9d45c645e..780acadc2 100644
--- a/src/test/resources/tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml
+++ b/src/test/resources/tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml
@@ -1,174 +1,174 @@
-

-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

+
+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-schema.json b/src/test/resources/tosca/new-converter/tca-schema.json
deleted file mode 100644
index 3f444aa9e..000000000
--- a/src/test/resources/tosca/new-converter/tca-schema.json
+++ /dev/null
@@ -1,175 +0,0 @@
-{
-  "title": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-  "type": "object",
-  "required": [],
-  "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"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/new-converter/tca-with-metadata.yaml b/src/test/resources/tosca/new-converter/tca-with-metadata.yaml
deleted file mode 100644
index c0d2a86e0..000000000
--- a/src/test/resources/tosca/new-converter/tca-with-metadata.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/tca-policy-test.yaml b/src/test/resources/tosca/tca-policy-test.yaml
deleted file mode 100644
index 3c5afb01d..000000000
--- a/src/test/resources/tosca/tca-policy-test.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-node_types:
-  policy.nodes.cdap.tca.hi.lo.app:
-    derived_from: policy.nodes.Root
-    properties:
-      domain:
-        type: string
-        description: Domain
-        constraints:
-        - equal: measurementsForVfScaling
-      functionalRole:
-        type: string
-        description: Function of the event source e.g., vnf1, vnf2, vnf3
-      thresholds:
-        type: list
-        description: Thresholds
-        entry_schema:
-          type: policy.data.thresholds
-data_types:
-  policy.data.thresholds:
-    properties:
-      closedLoopControlName:
-        type: string
-        description: A UNIQUE string identifying the Closed Loop ID this event is for.
-      direction:
-        type: string
-        constraints:
-        - valid_values: [ LESS, LESS_OR_EQUAL, GREATER, GREATER_OR_EQUAL]
-      fieldPath:
-        description: Field Path
-        type: string
-      severity:
-        type: string
-        description: event severity or priority
-        constraints:
-        - valid_values: [CRITICAL, MAJOR, MINOR, WARNING, NORMAL]
-      thresholdValue:
-        type: integer
-        description: ThresholdValue
-        default: 0
-        constraints:
-          - in_range: [ 0, 65535 ]
-      version:
-        type: string
-        description: Version for the closed loop message
-        constraints:
-          - min_length: 1
-      dummySignatures:
-        type: list
-        description: dummy Signatures
-        required: true
-        entry_schema:
-          type: policy.data.dummySignatureTraversal
-  policy.data.dummySignatureTraversal:
-    derived_from: tosca.nodes.Root
-    properties:
-      signature:
-        type: policy.data.DUMMY_Signature_FM
-        required: true
-      traversal:
-        type: policy.data.traverse
-        required: true
-  policy.data.traverse:
-    derived_from: tosca.nodes.Root
-    properties:
-      traversal:
-        type: string
-        description: Dummy Traverse
-        required: true
-        constraints:
-          - valid_values: [ ONE, TWO, THREE ]
-  policy.data.DUMMY_Signature_FM:
-    derived_from: tosca.nodes.Root
-    properties:
-      filter_clause:
-        type: string
-        description: Filter Clause
-        required: true
-        constraints:
-          - valid_values: [ OR, AND, NOT ]